summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-05 21:47:29 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-05 21:47:29 +0100
commitbc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1 (patch)
tree727781ce3d7ff828efdee614c1ded5175941ce0f
parentIPv6: Windows XP doesn't have the inet_pton() function, resorting to custom-formatting the address (diff)
downloadcuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.tar
cuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.tar.gz
cuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.tar.bz2
cuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.tar.lz
cuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.tar.xz
cuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.tar.zst
cuberite-bc8ad9d1b1ce4a1561e2759c15bd1cf2d4322dc1.zip
-rw-r--r--VC2008/MCServer.vcproj16
-rw-r--r--source/OSSupport/ListenThread.cpp (renamed from source/ListenThread.cpp)0
-rw-r--r--source/OSSupport/ListenThread.h (renamed from source/ListenThread.h)4
-rw-r--r--source/Server.h2
4 files changed, 11 insertions, 11 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 2e9d4b4b7..2a9d6ab25 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -500,14 +500,6 @@
>
</File>
<File
- RelativePath="..\source\ListenThread.cpp"
- >
- </File>
- <File
- RelativePath="..\source\ListenThread.h"
- >
- </File>
- <File
RelativePath="..\source\Log.cpp"
>
</File>
@@ -1191,6 +1183,14 @@
>
</File>
<File
+ RelativePath="..\source\OSSupport\ListenThread.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\OSSupport\ListenThread.h"
+ >
+ </File>
+ <File
RelativePath="..\source\OSSupport\MakeDir.cpp"
>
</File>
diff --git a/source/ListenThread.cpp b/source/OSSupport/ListenThread.cpp
index 3013f8cbf..3013f8cbf 100644
--- a/source/ListenThread.cpp
+++ b/source/OSSupport/ListenThread.cpp
diff --git a/source/ListenThread.h b/source/OSSupport/ListenThread.h
index ab2c97b9d..952cc8a3f 100644
--- a/source/ListenThread.h
+++ b/source/OSSupport/ListenThread.h
@@ -9,8 +9,8 @@
#pragma once
-#include "OSSupport/IsThread.h"
-#include "OSSupport/Socket.h"
+#include "IsThread.h"
+#include "Socket.h"
diff --git a/source/Server.h b/source/Server.h
index b12453aec..abcd7eaa1 100644
--- a/source/Server.h
+++ b/source/Server.h
@@ -12,9 +12,9 @@
#define CSERVER_H_INCLUDED
#include "OSSupport/SocketThreads.h"
+#include "OSSupport/ListenThread.h"
#include "CryptoPP/rsa.h"
#include "CryptoPP/randpool.h"
-#include "ListenThread.h"