large files support for wxFFile (patch 1077980 from Mike Wetherell)

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

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 7367459c4c7aac71537804879e2fe71ffdfa3107..e76403adc2963b0f8802c7102fc5c852538c20df 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -2,7 +2,7 @@
  * to make it work with configure?
  */
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
 #include "jconfig.vc"
 #else
 
@@ -10,11 +10,18 @@
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 
-/* use wxWindows' configure */
+/* use wxWidgets' 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__
@@ -29,7 +36,7 @@
 #undef void
 #undef const
 
-/* use wxWindows' configure */
+/* use wxWidgets' configure */
 /* #undef CHAR_IS_UNSIGNED */
 #ifdef __CHAR_UNSIGNED__
   #ifndef CHAR_IS_UNSIGNED
@@ -52,9 +59,15 @@
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 
-/* use wxWindows' configure */
+/* use wxWidgets' 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