summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-18 18:47:27 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-18 18:47:27 +0100
commitb173748c45b4221ad057305544bb5adca5aa4d15 (patch)
tree78a8217954bf69eca73d37081c667206fe14f346
parentcIsThread: Added support for getting current thread ID (diff)
downloadcuberite-b173748c45b4221ad057305544bb5adca5aa4d15.tar
cuberite-b173748c45b4221ad057305544bb5adca5aa4d15.tar.gz
cuberite-b173748c45b4221ad057305544bb5adca5aa4d15.tar.bz2
cuberite-b173748c45b4221ad057305544bb5adca5aa4d15.tar.lz
cuberite-b173748c45b4221ad057305544bb5adca5aa4d15.tar.xz
cuberite-b173748c45b4221ad057305544bb5adca5aa4d15.tar.zst
cuberite-b173748c45b4221ad057305544bb5adca5aa4d15.zip
-rw-r--r--source/Globals.h1
-rw-r--r--source/SquirrelBindings.cpp1
-rw-r--r--source/StringUtils.h4
3 files changed, 1 insertions, 5 deletions
diff --git a/source/Globals.h b/source/Globals.h
index b2a973cfd..1ede57bd4 100644
--- a/source/Globals.h
+++ b/source/Globals.h
@@ -69,6 +69,7 @@
#include <assert.h>
#include <stdio.h>
#include <math.h>
+#include <stdarg.h>
diff --git a/source/SquirrelBindings.cpp b/source/SquirrelBindings.cpp
index 392436ace..9c960d923 100644
--- a/source/SquirrelBindings.cpp
+++ b/source/SquirrelBindings.cpp
@@ -10,7 +10,6 @@
#include <sqplus/SquirrelObject.h>
#include <../squirrel/sqstate.h>
#include <../squirrel/sqvm.h>
-#include <stdarg.h>
#include "cPlugin.h"
#include "cPluginManager.h"
diff --git a/source/StringUtils.h b/source/StringUtils.h
index 3f4bdef1a..8805c1d99 100644
--- a/source/StringUtils.h
+++ b/source/StringUtils.h
@@ -11,10 +11,6 @@
-#ifndef _WIN32
-#include <stdarg.h>
-#endif
-
typedef std::string AString;