diff options
| -rw-r--r-- | src/const/net/maxpacketversion.h | 4 | ||||
| -rw-r--r-- | src/const/net/net.h | 4 | ||||
| -rw-r--r-- | src/net/ea/chatrecv.h | 2 | ||||
| -rw-r--r-- | src/net/ea/traderecv.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/beingrecv.h | 4 | ||||
| -rw-r--r-- | src/net/tmwa/beingrecv.h | 4 | ||||
| -rw-r--r-- | src/net/worldinfo.h | 4 | ||||
| -rw-r--r-- | src/options.h | 4 | ||||
| -rw-r--r-- | src/render/opengl/mgltypes.h | 6 |
9 files changed, 34 insertions, 0 deletions
diff --git a/src/const/net/maxpacketversion.h b/src/const/net/maxpacketversion.h index ba075b651..044459bc3 100644 --- a/src/const/net/maxpacketversion.h +++ b/src/const/net/maxpacketversion.h @@ -22,7 +22,11 @@ #define CONST_NET_MAXPACKETVERSION_H #if defined(__GXX_EXPERIMENTAL_CXX0X__) +#if defined(__APPLE__) +#include <tr1/cstdint> +#else // defined(__APPLE__) #include <cstdint> +#endif // defined(__APPLE__) #else // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) diff --git a/src/const/net/net.h b/src/const/net/net.h index 8d515732d..0077ca815 100644 --- a/src/const/net/net.h +++ b/src/const/net/net.h @@ -22,7 +22,11 @@ #define CONST_NET_NET_H #if defined(__GXX_EXPERIMENTAL_CXX0X__) +#if defined(__APPLE__) +#include <tr1/cstdint> +#else // defined(__APPLE__) #include <cstdint> +#endif // defined(__APPLE__) #else // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index 5c1bf20e6..ec762bc25 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -26,6 +26,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> +#else // defined(__APPLE__) +#include <cstdint> #endif // defined(__APPLE__) #else // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <stdint.h> diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h index 1b5eb4693..69b96d689 100644 --- a/src/net/ea/traderecv.h +++ b/src/net/ea/traderecv.h @@ -26,6 +26,8 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> +#else // defined(__APPLE__) +#include <cstdint> #endif // defined(__APPLE__) #else // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <stdint.h> diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h index 16a788ab3..f9b3c01a6 100644 --- a/src/net/eathena/beingrecv.h +++ b/src/net/eathena/beingrecv.h @@ -32,7 +32,11 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> +#else // defined(__APPLE__) +#include <cstdint> #endif // defined(__APPLE__) +#else // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include "localconsts.h" diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h index 91059e50c..89fc75f0f 100644 --- a/src/net/tmwa/beingrecv.h +++ b/src/net/tmwa/beingrecv.h @@ -26,7 +26,11 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> +#else // defined(__APPLE__) +#include <cstdint> #endif // defined(__APPLE__) +#else // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include "localconsts.h" diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index b9c16f0e4..03063c682 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -28,7 +28,11 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> +#else // defined(__APPLE__) +#include <cstdint> #endif // defined(__APPLE__) +#else // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include <string> diff --git a/src/options.h b/src/options.h index d4d8bb8bd..011919533 100644 --- a/src/options.h +++ b/src/options.h @@ -28,7 +28,11 @@ #if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__APPLE__) #include <tr1/cstdint> +#else // defined(__APPLE__) +#include <cstdint> #endif // defined(__APPLE__) +#else // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #include "localconsts.h" diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h index bf5a34fc7..53af6d129 100644 --- a/src/render/opengl/mgltypes.h +++ b/src/render/opengl/mgltypes.h @@ -72,7 +72,13 @@ RENDER_OPENGL_MGLDEFINES_H #ifndef USE_SDL2 #if defined(__GXX_EXPERIMENTAL_CXX0X__) +#if defined(__APPLE__) +#include <tr1/cstdint> +#else // defined(__APPLE__) #include <cstdint> +#endif // defined(__APPLE__) +#else // defined(__GXX_EXPERIMENTAL_CXX0X__) +#include <stdint.h> #endif // defined(__GXX_EXPERIMENTAL_CXX0X__) #endif // USE_SDL2 |