X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6177576129c007cbd04f1100d4e8e844a32aa114..749f13d4a2d25b3ab4509131b425d02fb2327569:/src/jpeg/jconfig.h?ds=inline

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index d1aeb622a6..bd5f5db9fa 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
 
@@ -15,7 +11,7 @@
 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
 #   ifndef __WXMAC__
-#       define __WWXMAC__
+#       define __WXMAC__
 #   endif
 #endif
 #endif
@@ -23,7 +19,7 @@
 /* use wxWidgets' configure */
 #include "wx/setup.h"
 
-// If using Metrowerks and not using configure-generated setup
+/* If using Metrowerks and not using configure-generated setup */
 #if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
 
@@ -37,7 +33,7 @@
 #       include <machine/ansi.h>
 #   endif
 
-// automatically includes MacHeaders
+/* automatically includes MacHeaders */
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
 #endif
@@ -59,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