X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38a87cfe1a6a583cd0e578d553d05fd1c6492c8b..de5dd006449a97887afb2aad39c8f20549818d98:/src/jpeg/jconfig.h diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index 3593170ff8..d1aeb622a6 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -10,33 +10,46 @@ /* jconfig.cfg --- source file edited by configure script */ /* see jconfig.doc for explanations */ -/* use wxWindows' configure */ +/* If using MetroWerks on Mac define __WXMAC__ if it isn't already + FIXME: Is this necessary any longer? */ #ifdef __MWERKS__ #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ ) - #define __WXMAC__ - #define USE_MAC_MEMMGR - #ifdef __MACH__ - #include - #include - #include - #undef WCHAR_MAX - #include - #endif +# ifndef __WXMAC__ +# define __WWXMAC__ +# endif +#endif +#endif + +/* use wxWidgets' configure */ +#include "wx/setup.h" + +// If using Metrowerks and not using configure-generated setup +#if defined(__MWERKS__) && !defined(__WX_SETUP_H__) +#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ ) + +# define USE_MAC_MEMMGR + +# ifdef __MACH__ +# include +# include +# include +# undef WCHAR_MAX +# include +# endif + // automatically includes MacHeaders #elif (__MWERKS__ >= 0x0900) && __INTEL__ #define __WXMSW__ #endif #endif -#include "wx/setup.h" - #define HAVE_PROTOTYPES #define HAVE_UNSIGNED_CHAR #define HAVE_UNSIGNED_SHORT #undef void #undef const -/* use wxWindows' configure */ +/* use wxWidgets' configure */ /* #undef CHAR_IS_UNSIGNED */ #ifdef __CHAR_UNSIGNED__ #ifndef CHAR_IS_UNSIGNED @@ -59,7 +72,7 @@ #undef RIGHT_SHIFT_IS_UNSIGNED -/* use wxWindows' configure */ +/* use wxWidgets' configure */ /* #define INLINE __inline__ */ #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400) #define INLINE