X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fd8a4504da7215d889e3e6234476581b0ba7adf..483c6690e98d6ad41b37f02d29b63a26b68a07c0:/src/msw/dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 54ccf8ab88..c488c6e19e 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -49,10 +49,12 @@
 #include "wx/msw/dib.h"
 
 #ifndef __TWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #ifndef SEEK_CUR
 /* flags for _lseek */
@@ -645,7 +647,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
 #ifdef __WXWINE__
         return (FALSE);
 #else
-    NPLOGPALETTE npPal;
+    LPLOGPALETTE npPal;
     RGBQUAD far *lpRGB;
     HPALETTE hLogPal;
     WORD i;
@@ -659,7 +661,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
 	npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
 				(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
 */
-	npPal = (NPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
+	npPal = (LPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
 				(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
         if (!npPal)
 	    return(FALSE);