diff options
| author | Socapex <philippe.groarke@gmail.com> | 2015-07-20 02:48:54 -0400 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-07-20 14:50:23 +0300 |
| commit | 1ab178f6a10759b53f5e1f58a82efda5c5a3ad48 (patch) | |
| tree | 5efde72c1d88c72172489eeee45e996947c0f79f /src | |
| parent | 08ee66582f53822254763d79ca511c24b136be0f (diff) | |
| download | manaplus-1ab178f6a10759b53f5e1f58a82efda5c5a3ad48.tar.gz manaplus-1ab178f6a10759b53f5e1f58a82efda5c5a3ad48.tar.bz2 manaplus-1ab178f6a10759b53f5e1f58a82efda5c5a3ad48.tar.xz manaplus-1ab178f6a10759b53f5e1f58a82efda5c5a3ad48.zip | |
OS X version now current.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 4 | ||||
| -rw-r--r-- | src/options.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp index a94134baf..f75ba53b9 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -139,10 +139,6 @@ #include "configuration.h" #endif -#ifdef __APPLE__ -#include <CoreFoundation/CFBundle.h> -#endif - #ifdef WIN32 #include <SDL_syswm.h> #include "utils/specialfolder.h" diff --git a/src/options.h b/src/options.h index 76c715cf3..32395fd5d 100644 --- a/src/options.h +++ b/src/options.h @@ -26,7 +26,12 @@ #include <string> #if defined(__GXX_EXPERIMENTAL_CXX0X__) -#include <cstdint> +# if defined(__APPLE__) +# include <tr1/cstdint> +# else +# include <cstdint> +#endif + #else #include <stdint.h> #endif |