X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dfef5a8124ac0f1bb2aed6ef5ddfa833e8e2c6e..98840d95db7ab85159dc63d523864b2523d48cae:/src/jpeg/jconfig.h diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index e3c94a1717..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 <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__ @@ -56,6 +63,8 @@ /* #define INLINE __inline__ */ #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400) #define INLINE +#elif defined(__WATCOMC__) +#define INLINE #else #define INLINE inline #endif