X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..3b28eaf5c3ff53c282281925b1c5fd5e64e71add:/src/jpeg/jconfig.h diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index 7367459c4c..3593170ff8 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 @@ -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 + #include + #include + #undef WCHAR_MAX + #include + #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