X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0c5744137337d9f25b9f298fbad6550ab1209d1..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/jpeg/jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index ce2d518459..c8afdeb56e 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,8 +1,4 @@
-/* This test added by JACS as a quick fix. What should we do
- * to make it work with configure?
- */
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
+#if defined(_WIN32) || defined(__OS2__)
 #include "jconfig.vc"
 #else
 
@@ -11,28 +7,6 @@
 /* see jconfig.doc for explanations */
 
 /* use wxWidgets' configure */
-#ifdef __MWERKS__
-#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
-#   ifndef __WXMAC__
-#       define __WWXMAC__
-#   endif
-
-#   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
-
 #include "wx/setup.h"
 
 #define HAVE_PROTOTYPES
@@ -51,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