X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b41f6bc001ea11a0585771e0fa92c7bc1dc6863..0ba143c9a0ce7cfe812d248d5afee1c377ccaaee:/src/xpm/scan.c

diff --git a/src/xpm/scan.c b/src/xpm/scan.c
index 8ff2e47c95..f1b35d0e12 100644
--- a/src/xpm/scan.c
+++ b/src/xpm/scan.c
@@ -319,11 +319,9 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
 
 #else
 
-#ifndef __OS2__
 	    ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
 		    			storePixel);
 /* calling convention all messed up OS/2 -- figure out later */
-#endif
 
 #endif
 
@@ -1042,11 +1040,8 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
 	    pixel = GetPixel(*display, x, y);
 #endif
 
-#ifndef __OS2__
-/* calling convention all messed up under OS/2 */
 	    if ((*storeFunc) (pixel, pmap, iptr))
 		return (XpmNoMemory);
-#endif
 	}
     }
     return (XpmSuccess);