diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-29 18:30:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-29 18:30:13 +0300 |
| commit | a341a44c85f2f6a9ebc414169d4b0178af74bc7a (patch) | |
| tree | baf95b154eb18a676027e6f97b0c0b43c1d8ab9b | |
| parent | dfea7028b3b2e3c3dad896881a705ed213730426 (diff) | |
| download | plus-a341a44c85f2f6a9ebc414169d4b0178af74bc7a.tar.gz plus-a341a44c85f2f6a9ebc414169d4b0178af74bc7a.tar.bz2 plus-a341a44c85f2f6a9ebc414169d4b0178af74bc7a.tar.xz plus-a341a44c85f2f6a9ebc414169d4b0178af74bc7a.zip | |
Fix compilation with different compilation options.
| -rw-r--r-- | src/net/ea/charserverhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/ea/chatrecv.h | 10 | ||||
| -rw-r--r-- | src/net/worldinfo.h | 12 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 0983a2007..c8964b1a1 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -22,6 +22,7 @@ #include "net/ea/charserverhandler.h" +#include "net/character.h" #include "net/serverinfo.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h index c01bd7fe9..8baecd863 100644 --- a/src/net/ea/chatrecv.h +++ b/src/net/ea/chatrecv.h @@ -23,6 +23,16 @@ #ifndef NET_EA_CHATRECV_H #define NET_EA_CHATRECV_H +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#if defined(__APPLE__) +#include <tr1/cstdint> +#else +#include <cstdint> +#endif +#else +#include <stdint.h> +#endif + #include <string> #include <queue> diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index 2903caf29..1afde7cb3 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -23,9 +23,21 @@ #ifndef NET_WORLDINFO_H #define NET_WORLDINFO_H +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#if defined(__APPLE__) +#include <tr1/cstdint> +#else +#include <cstdint> +#endif +#else +#include <stdint.h> +#endif + #include <string> #include <vector> +#include "localconsts.h" + struct WorldInfo final { WorldInfo() : |