summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-23 15:15:10 +0200
committerMattes D <github@xoft.cz>2014-10-23 15:15:10 +0200
commit449d08cb3d1a8ef430430790fcea0ce36b713866 (patch)
treed6b8c2d3f8ab1dbd9139d964ba130912cae5c949 /src/Root.cpp
parentRemoved the "conditional expression is constant" warning. (diff)
downloadcuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.gz
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.bz2
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.lz
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.xz
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.zst
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.zip
Diffstat (limited to 'src/Root.cpp')
-rw-r--r--src/Root.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 6a91ec238..24c1a4cc8 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -19,11 +19,10 @@
#include "OSSupport/Timer.h"
#include "LoggerListeners.h"
#include "BuildInfo.h"
-
-#include "inifile/iniFile.h"
+#include "IniFile.h"
#ifdef _WIN32
- #include "conio.h"
+ #include <conio.h>
#include <psapi.h>
#elif defined(__linux__)
#include <fstream>