X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dea106e532d08dada21a039ec80d86d71d5e5631..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index ae2f01b8c6..005719486b 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -146,14 +146,31 @@ defined(THINK_C) || \ (defined(__MWERKS__) && !defined(__INTEL__)) /* MacOS */ -#elif defined(__WXMAC__) && defined(__DARWIN__) +#elif defined(__WXMAC__) && defined(__APPLE__) /* Mac OS X */ #define __UNIX_LIKE__ + /* + These defines are needed when compiling using Project Builder + with a non generated setup0.h + */ + #ifndef __UNIX__ + #define __UNIX__ 1 + #endif + #ifndef __BSD__ + #define __BSD__ 1 + #endif + #ifndef __DARWIN__ + #define __DARWIN__ 1 + #endif + #ifndef __POWERPC__ + #define __POWERPC__ 1 + #endif + /* Some code has been added to workaround defects(?) in the - bundled gcc compiler. These corrections are identified by: - __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) + bundled gcc compiler. These corrections are identified by + __DARWIN__ for Darwin related corrections (wxMac, wxMotif) */ #elif defined(__OS2__) #if defined(__IBMCPP__) @@ -217,7 +234,7 @@ #endif /* __WXMOTIF__ */ #endif -#if defined(__WXMOTIF__) +#if defined(__WXMOTIF__) || defined(__WXX11__) #define __X__ #endif