X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24a39c0dd5b46ad2de22da1c21758e651a24bd9b..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/jpeg/jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 7b26b7feae..bd5f5db9fa 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,4 +1,4 @@
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__OS2__)
 #include "jconfig.vc"
 #else
 
@@ -11,7 +11,7 @@
 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
 #   ifndef __WXMAC__
-#       define __WWXMAC__
+#       define __WXMAC__
 #   endif
 #endif
 #endif
@@ -55,8 +55,14 @@
   #undef CHAR_IS_UNSIGNED
 #endif
 
+#ifndef HAVE_STDDEF_H
 #define HAVE_STDDEF_H
+#endif
+
+#ifndef HAVE_STDLIB_H
 #define HAVE_STDLIB_H
+#endif
+
 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H
 #undef NEED_FAR_POINTERS