X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2662e49e09dcdddd8c0c571e70893bc702449e93..d391a3451080638e6b1f2f24f92078d18c5ab9d8:/src/msw/dibutils.cpp

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index e8f639f22c..923135a2a4 100644
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -167,7 +167,7 @@ int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
   bmf.bfOffBits = sizeof(bmf) + (char FAR*)(DibPtr(lpbi)) - (char FAR*)lpbi;
-#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__)
+#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) || defined(wxUSE_NORLANDER_HEADERS)
   if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
   _hwrite(fh, (LPCSTR)lpbi, size)<0) {
     _lclose(fh);
@@ -716,7 +716,7 @@ HPALETTE MakePalette(const BITMAPINFO FAR* Info, UINT flags)
 
    logPal->palVersion  = 0x300; // Windows 3.0 version
    logPal->palNumEntries = nColors;
-   for (short n = 0; n < nColors; n++) {
+   for (WORD n = 0; n < nColors; n++) {
     logPal->palPalEntry[n].peRed   = rgb[n].rgbRed;
     logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen;
     logPal->palPalEntry[n].peBlue  = rgb[n].rgbBlue;