Ticket #8985: no-fpermissive.diff

engines/agi/lzw.cpp

@@ -144 +144 @@
         setBits(START_BITS);    /* Starts at 9-bits */
         lzwnext = 257;          /* Next available code to define */
 
-        end = (unsigned char *)((long)out + (long)len);
+        end = (unsigned char *)((size_t)out + (long)len);
 
         lzwold = inputCode(&in);        /* Read in the first code */
         c = lzwold;

engines/scumm/gfx.cpp

@@ -603 +603 @@
 
                 // The values x, width, etc. are all multiples of 8 at this point,
                 // so loop unrolloing might be a good idea...
-                assert(0 == ((long)text & 3));
+                assert(0 == ((size_t)text & 3));
                 assert(0 == (width & 3));
 
                 // Compose the text over the game graphics

engines/agos/subroutine.cpp

@@ -220 +220 @@
 }
 
 void AGOSEngine::alignTableMem() {
-        if ((unsigned long)_tablesHeapPtr & 3) {
+        if ((size_t)_tablesHeapPtr & 3) {
                 _tablesHeapPtr += 2;
                 _tablesHeapCurPos += 2;
         }

engines/sky/compact.cpp

@@ -34 +34 @@
 
 #define SKY_CPT_SIZE    419427
 
-#define OFFS(type,item) (((long)(&((type*)0)->item)))
+#define OFFS(type,item) (((size_t)(&((type*)0)->item)))
 #define MK32(type,item) OFFS(type, item),0,0,0
 #define MK16(type,item) OFFS(type, item),0
 #define MK32_A5(type, item) MK32(type, item[0]), MK32(type, item[1]), \

graphics/scaler.cpp

@@ -194 +194 @@
                                                         int width, int height) {
         uint8 *r;
 
-        assert(((long)dstPtr & 3) == 0);
+        assert(((size_t)dstPtr & 3) == 0);
         assert(sizeof(OverlayColor) == 2);
         while (height--) {
                 r = dstPtr;
@@ -220 +220 @@
         const uint32 dstPitch2 = dstPitch * 2;
         const uint32 dstPitch3 = dstPitch * 3;
 
-        assert(((long)dstPtr & 1) == 0);
+        assert(((size_t)dstPtr & 1) == 0);
         while (height--) {
                 r = dstPtr;
                 for (int i = 0; i < width; ++i, r += 6) {
@@ -255 +255 @@
         const uint32 dstPitch3 = dstPitch * 3;
         const uint32 srcPitch2 = srcPitch * 2;
 
-        assert(((long)dstPtr & 1) == 0);
+        assert(((size_t)dstPtr & 1) == 0);
         while (height > 0) {
                 r = dstPtr;
                 for (int i = 0; i < width; i += 2, r += 6) {

backends/midi/windows.cpp

@@ -62 +62 @@
                 return MERR_ALREADY_OPEN;
 
         _streamEvent = CreateEvent(NULL, true, true, NULL);
-        MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, MIDI_MAPPER, (unsigned long)_streamEvent, 0, CALLBACK_EVENT);
+        MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, MIDI_MAPPER, (size_t)_streamEvent, 0, CALLBACK_EVENT);
         if (res != MMSYSERR_NOERROR) {
                 check_error(res);
                 CloseHandle(_streamEvent);

backends/platform/sdl/graphics.cpp

@@ -793 +793 @@
         assert(h > 0 && y + h <= _videoMode.screenHeight);
         assert(w > 0 && x + w <= _videoMode.screenWidth);
 
-        if (((long)src & 3) == 0 && pitch == _videoMode.screenWidth && x == 0 && y == 0 &&
+        if (((size_t)src & 3) == 0 && pitch == _videoMode.screenWidth && x == 0 && y == 0 &&
                         w == _videoMode.screenWidth && h == _videoMode.screenHeight && _modeFlags & DF_WANT_RECT_OPTIM) {
                 /* Special, optimized case for full screen updates.
                  * It tries to determine what areas were actually changed,
@@ -997 +997 @@
 
 void OSystem_SDL::addDirtyRgnAuto(const byte *buf) {
         assert(buf);
-        assert(((long)buf & 3) == 0);
+        assert(((size_t)buf & 3) == 0);
 
         /* generate a table of the checksums */
         makeChecksums(buf);