X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..824fd93d761e1e697be19a4ca582c5259e12c8ea:/src/jpeg/jconfig.h?ds=inline diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index 42d94427c6..e76403adc2 100644 --- 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 + #include + #include + #undef WCHAR_MAX + #include + #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,7 +59,7 @@ #undef RIGHT_SHIFT_IS_UNSIGNED -/* use wxWindows' configure */ +/* use wxWidgets' configure */ /* #define INLINE __inline__ */ #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400) #define INLINE