diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-18 20:06:11 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-18 20:06:11 +0100 |
| commit | e627f2f98cb9a2ec7cddcaac779350abcbae414a (patch) | |
| tree | 6101aa8aa5a0152c278e129a26ba7ca26172597c /src/Globals.h | |
| parent | added zlib (diff) | |
| parent | Merge pull request #440 from mc-server/repeaterfixes (diff) | |
| download | cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.tar cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.tar.gz cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.tar.bz2 cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.tar.lz cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.tar.xz cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.tar.zst cuberite-e627f2f98cb9a2ec7cddcaac779350abcbae414a.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Globals.h b/src/Globals.h index cb67d9fda..58badf4dd 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -124,9 +124,6 @@ typedef unsigned short UInt16; #include <semaphore.h> #include <errno.h> #include <fcntl.h> -#if !defined(ANDROID_NDK) - #include <tr1/memory> -#endif #endif #if defined(ANDROID_NDK) @@ -220,6 +217,7 @@ public: // Common headers (part 2, with macros): #include "ChunkDef.h" #include "BlockID.h" +#include "Entities/Effects.h" |