some fixes for VC++ 1.5 makefiles

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 54ccf8ab88cf35239c1b7119448fee8660c07a7c..c488c6e19eb17b4f29846bc8975c34b7f1c257fb 100644 (file)
--- 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);