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

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 7b26b7feae..c8afdeb56e 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
 
@@ -6,39 +6,9 @@
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 
-/* If using MetroWerks on Mac define __WXMAC__ if it isn't already
-   FIXME: Is this necessary any longer? */
-#ifdef __MWERKS__
-#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
-#   ifndef __WXMAC__
-#       define __WWXMAC__
-#   endif
-#endif
-#endif
-
 /* use wxWidgets' configure */
 #include "wx/setup.h"
 
-/* If using Metrowerks and not using configure-generated setup */
-#if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
-#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
-
-#   define USE_MAC_MEMMGR
-
-#   ifdef __MACH__
-#       include <ansi_prefix.mach.h>
-#       include <msl_c_version.h>
-#       include <stdint.h>
-#       undef WCHAR_MAX
-#       include <machine/ansi.h>
-#   endif
-
-/* automatically includes MacHeaders */
-#elif (__MWERKS__ >= 0x0900) && __INTEL__
-    #define __WXMSW__
-#endif
-#endif
-
 #define HAVE_PROTOTYPES
 #define HAVE_UNSIGNED_CHAR
 #define HAVE_UNSIGNED_SHORT
@@ -55,8 +25,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