From: Dimitri Schoolwerth Date: Fri, 18 Feb 2005 09:53:47 +0000 (+0000) Subject: don't redefine __WXMAC__ X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d0c5744137337d9f25b9f298fbad6550ab1209d1?ds=inline don't redefine __WXMAC__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index e76403adc2..ce2d518459 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -13,15 +13,20 @@ /* use wxWidgets' configure */ #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 + +# define USE_MAC_MEMMGR + +# ifdef __MACH__ +# include +# include +# include +# undef WCHAR_MAX +# include +# endif + // automatically includes MacHeaders #elif (__MWERKS__ >= 0x0900) && __INTEL__ #define __WXMSW__