fixed wxBase and GUI separation for sockets code

[wxWidgets.git] / src / jpeg / jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 7367459c4c7aac71537804879e2fe71ffdfa3107..1050b5e2fc84ffea7ee872d473a8413cce8c82b7 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -12,9 +12,16 @@
 
 /* use wxWindows' configure */
 #ifdef __MWERKS__
-#if (__MWERKS__ < 0x0900) || macintosh
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
     #define __WXMAC__
                #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__
@@ -54,7 +61,13 @@
 
 /* use wxWindows' configure */
 /* #define INLINE __inline__ */
+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
+#define INLINE
+#elif defined(__WATCOMC__)
+#define INLINE
+#else
 #define INLINE inline
+#endif
 
 /* These are for configuring the JPEG memory manager. */
 #undef DEFAULT_MAX_MEM