summaryrefslogtreecommitdiffstats
path: root/source/cWebAdmin.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-01-29 20:28:19 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-01-29 20:28:19 +0100
commit89afb970d88e3efa8ddb2f1eafff10cd6525f2b7 (patch)
tree206b3ba15c0fc87b3bf9ad7371f73887280945c4 /source/cWebAdmin.cpp
parentVC2008 compilation with new lua webplugin (diff)
downloadcuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar
cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.gz
cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.bz2
cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.lz
cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.xz
cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.zst
cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.zip
Diffstat (limited to '')
-rw-r--r--source/cWebAdmin.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/source/cWebAdmin.cpp b/source/cWebAdmin.cpp
index 6f9546304..23348fcdc 100644
--- a/source/cWebAdmin.cpp
+++ b/source/cWebAdmin.cpp
@@ -1,5 +1,7 @@
+
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
#include "cWebAdmin.h"
-#include "cMCLogger.h"
#include "cStringMap.h"
#include "cWebPlugin.h"
@@ -8,24 +10,23 @@
#include "cPluginManager.h"
#include "cPlugin.h"
-#include "cEvent.h"
#include "cWorld.h"
#include "cPlayer.h"
#include "cServer.h"
#include "cRoot.h"
-#include <vector>
-
#include "../iniFile/iniFile.h"
-#include "MemoryLeak.h"
#ifdef _WIN32
-#include <psapi.h>
+ #include <psapi.h>
#else
-#include <sys/resource.h>
-#define sprintf_s(dst, size, format, ...) sprintf(dst, format, __VA_ARGS__ )
+ #include <sys/resource.h>
#endif
+
+
+
+
extern std::vector<std::string> StringSplit(std::string str, std::string delim);
cWebAdmin* WebAdmin = 0;