--- src/dos/drive_cache.cpp.orig 2005-05-30 10:35:39.000000000 +0200
+++ src/dos/drive_cache.cpp 2005-05-30 10:38:48.000000000 +0200
@@ -317,12 +317,12 @@
{
char* cpos = strchr(shortName,'~');
if (cpos) {
- Bits compareCount1 = (int)cpos - (int)shortName;
+ Bits compareCount1 = (intptr_t)cpos - (intptr_t)shortName;
char* endPos = strchr(cpos,'.');
- Bitu numberSize = endPos ? int(endPos)-int(cpos) : strlen(cpos);
+ Bitu numberSize = endPos ? intptr_t(endPos)-intptr_t(cpos) : strlen(cpos);
char* lpos = strchr(compareName,'.');
- Bits compareCount2 = lpos ? int(lpos)-int(compareName) : strlen(compareName);
+ Bits compareCount2 = lpos ? intptr_t(lpos)-intptr_t(compareName) : strlen(compareName);
if (compareCount2>8) compareCount2 = 8;
compareCount2 -= numberSize;
--- src/gui/midi_alsa.h.orig 2005-05-30 10:40:34.000000000 +0200
+++ src/gui/midi_alsa.h 2005-05-30 10:42:05.000000000 +0200
@@ -112,7 +112,7 @@
}
break;
default:
- LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg);
+ LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (intptr_t)msg);
send_event(1);
break;
}
--- src/dos/drive_local.cpp.orig 2005-05-30 21:41:04.000000000 +0200
+++ src/dos/drive_local.cpp 2005-05-30 21:42:19.000000000 +0200
@@ -409,7 +409,7 @@
//TODO Give some doserrorcode;
return false;//ERROR
}
- int ret=fseek(fhandle,*pos,seektype);
+ int ret=fseek(fhandle,*reinterpret_cast<Bit32s*>(pos),seektype);
if (ret!=0) {
// Out of file range, pretend everythings ok
// and move file pointer top end of file... ?! (Black Thorne)