diff options
Diffstat (limited to '')
-rw-r--r-- | source/OSSupport/BlockingTCPLink.cpp (renamed from source/cBlockingTCPLink.cpp) | 2 | ||||
-rw-r--r-- | source/OSSupport/BlockingTCPLink.h (renamed from source/cBlockingTCPLink.h) | 2 | ||||
-rw-r--r-- | source/OSSupport/CriticalSection.cpp (renamed from source/cCriticalSection.cpp) | 2 | ||||
-rw-r--r-- | source/OSSupport/CriticalSection.h (renamed from source/cCriticalSection.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/Event.cpp (renamed from source/cEvent.cpp) | 4 | ||||
-rw-r--r-- | source/OSSupport/Event.h (renamed from source/cEvent.h) | 2 | ||||
-rw-r--r-- | source/OSSupport/File.cpp (renamed from source/cFile.cpp) | 2 | ||||
-rw-r--r-- | source/OSSupport/File.h (renamed from source/cFile.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/IsThread.cpp (renamed from source/cIsThread.cpp) | 4 | ||||
-rw-r--r-- | source/OSSupport/IsThread.h (renamed from source/cIsThread.h) | 2 | ||||
-rw-r--r-- | source/OSSupport/MakeDir.cpp (renamed from source/cMakeDir.cpp) | 2 | ||||
-rw-r--r-- | source/OSSupport/MakeDir.h (renamed from source/cMakeDir.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/Semaphore.cpp (renamed from source/cSemaphore.cpp) | 0 | ||||
-rw-r--r-- | source/OSSupport/Semaphore.h (renamed from source/cSemaphore.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/Sleep.cpp (renamed from source/cSleep.cpp) | 0 | ||||
-rw-r--r-- | source/OSSupport/Sleep.h (renamed from source/cSleep.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/Socket.cpp (renamed from source/cSocket.cpp) | 2 | ||||
-rw-r--r-- | source/OSSupport/Socket.h (renamed from source/cSocket.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/SocketThreads.cpp (renamed from source/cSocketThreads.cpp) | 3 | ||||
-rw-r--r-- | source/OSSupport/SocketThreads.h (renamed from source/cSocketThreads.h) | 6 | ||||
-rw-r--r-- | source/OSSupport/TCPLink.cpp (renamed from source/cTCPLink.cpp) | 3 | ||||
-rw-r--r-- | source/OSSupport/TCPLink.h (renamed from source/cTCPLink.h) | 2 | ||||
-rw-r--r-- | source/OSSupport/Thread.cpp (renamed from source/cThread.cpp) | 0 | ||||
-rw-r--r-- | source/OSSupport/Thread.h (renamed from source/cThread.h) | 0 | ||||
-rw-r--r-- | source/OSSupport/Timer.cpp (renamed from source/cTimer.cpp) | 2 | ||||
-rw-r--r-- | source/OSSupport/Timer.h (renamed from source/cTimer.h) | 0 |
26 files changed, 19 insertions, 21 deletions
diff --git a/source/cBlockingTCPLink.cpp b/source/OSSupport/BlockingTCPLink.cpp index d297304cf..55454a4b5 100644 --- a/source/cBlockingTCPLink.cpp +++ b/source/OSSupport/BlockingTCPLink.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cBlockingTCPLink.h" +#include "BlockingTCPLink.h" diff --git a/source/cBlockingTCPLink.h b/source/OSSupport/BlockingTCPLink.h index feba52970..4ee0ccb3b 100644 --- a/source/cBlockingTCPLink.h +++ b/source/OSSupport/BlockingTCPLink.h @@ -1,7 +1,7 @@ #pragma once -#include "cSocket.h" +#include "Socket.h" diff --git a/source/cCriticalSection.cpp b/source/OSSupport/CriticalSection.cpp index 47e2c2c2d..f87a2b3ba 100644 --- a/source/cCriticalSection.cpp +++ b/source/OSSupport/CriticalSection.cpp @@ -1,6 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cIsThread.h" +#include "IsThread.h" diff --git a/source/cCriticalSection.h b/source/OSSupport/CriticalSection.h index 9852a2e6c..9852a2e6c 100644 --- a/source/cCriticalSection.h +++ b/source/OSSupport/CriticalSection.h diff --git a/source/cEvent.cpp b/source/OSSupport/Event.cpp index a94fa83bc..13b5c1d3f 100644 --- a/source/cEvent.cpp +++ b/source/OSSupport/Event.cpp @@ -1,12 +1,12 @@ -// cEvent.cpp +// Event.cpp // Implements the cEvent object representing an OS-specific synchronization primitive that can be waited-for // Implemented as an Event on Win and as a 1-semaphore on *nix #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cEvent.h" +#include "Event.h" diff --git a/source/cEvent.h b/source/OSSupport/Event.h index bc1505a11..71f418c0c 100644 --- a/source/cEvent.h +++ b/source/OSSupport/Event.h @@ -1,5 +1,5 @@ -// cEvent.h +// Event.h // Interfaces to the cEvent object representing an OS-specific synchronization primitive that can be waited-for // Implemented as an Event on Win and as a 1-semaphore on *nix diff --git a/source/cFile.cpp b/source/OSSupport/File.cpp index 5558bfd45..fdae0b34e 100644 --- a/source/cFile.cpp +++ b/source/OSSupport/File.cpp @@ -5,7 +5,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cFile.h" +#include "File.h" diff --git a/source/cFile.h b/source/OSSupport/File.h index d16784236..d16784236 100644 --- a/source/cFile.h +++ b/source/OSSupport/File.h diff --git a/source/cIsThread.cpp b/source/OSSupport/IsThread.cpp index cfc6fa72a..9dcbc43eb 100644 --- a/source/cIsThread.cpp +++ b/source/OSSupport/IsThread.cpp @@ -1,12 +1,12 @@ -// cIsThread.cpp +// IsThread.cpp // Implements the cIsThread class representing an OS-independent wrapper for a class that implements a thread. // This class will eventually suupersede the old cThread class #include "Globals.h" -#include "cIsThread.h" +#include "IsThread.h" diff --git a/source/cIsThread.h b/source/OSSupport/IsThread.h index e2d53565d..ed9a32852 100644 --- a/source/cIsThread.h +++ b/source/OSSupport/IsThread.h @@ -1,5 +1,5 @@ -// cIsThread.h +// IsThread.h // Interfaces to the cIsThread class representing an OS-independent wrapper for a class that implements a thread. // This class will eventually suupersede the old cThread class diff --git a/source/cMakeDir.cpp b/source/OSSupport/MakeDir.cpp index 478d1d872..10ccfe9ec 100644 --- a/source/cMakeDir.cpp +++ b/source/OSSupport/MakeDir.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cMakeDir.h" +#include "MakeDir.h" diff --git a/source/cMakeDir.h b/source/OSSupport/MakeDir.h index e66cf1071..e66cf1071 100644 --- a/source/cMakeDir.h +++ b/source/OSSupport/MakeDir.h diff --git a/source/cSemaphore.cpp b/source/OSSupport/Semaphore.cpp index 468de6858..468de6858 100644 --- a/source/cSemaphore.cpp +++ b/source/OSSupport/Semaphore.cpp diff --git a/source/cSemaphore.h b/source/OSSupport/Semaphore.h index fbe8907f1..fbe8907f1 100644 --- a/source/cSemaphore.h +++ b/source/OSSupport/Semaphore.h diff --git a/source/cSleep.cpp b/source/OSSupport/Sleep.cpp index 70fb06b40..70fb06b40 100644 --- a/source/cSleep.cpp +++ b/source/OSSupport/Sleep.cpp diff --git a/source/cSleep.h b/source/OSSupport/Sleep.h index 5298c15da..5298c15da 100644 --- a/source/cSleep.h +++ b/source/OSSupport/Sleep.h diff --git a/source/cSocket.cpp b/source/OSSupport/Socket.cpp index 031a1c63a..8d6a5ee94 100644 --- a/source/cSocket.cpp +++ b/source/OSSupport/Socket.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cSocket.h" +#include "Socket.h" #ifndef _WIN32 #include <netdb.h> diff --git a/source/cSocket.h b/source/OSSupport/Socket.h index f1c3f233c..f1c3f233c 100644 --- a/source/cSocket.h +++ b/source/OSSupport/Socket.h diff --git a/source/cSocketThreads.cpp b/source/OSSupport/SocketThreads.cpp index e1fdd8f24..ae23b4496 100644 --- a/source/cSocketThreads.cpp +++ b/source/OSSupport/SocketThreads.cpp @@ -6,8 +6,7 @@ // For more detail, see http://forum.mc-server.org/showthread.php?tid=327 #include "Globals.h" -#include "cSocketThreads.h" -#include "cClientHandle.h" +#include "SocketThreads.h" diff --git a/source/cSocketThreads.h b/source/OSSupport/SocketThreads.h index 4f4e4bbe6..4683e0e4d 100644 --- a/source/cSocketThreads.h +++ b/source/OSSupport/SocketThreads.h @@ -1,5 +1,5 @@ -// cSocketThreads.h +// SocketThreads.h // Interfaces to the cSocketThreads class representing the heart of MCS's client networking. // This object takes care of network communication, groups sockets into threads and uses as little threads as possible for full read / write support @@ -30,8 +30,8 @@ This means that the socket can be written to several times before finally closin #ifndef CSOCKETTHREADS_H_INCLUDED #define CSOCKETTHREADS_H_INCLUDED -#include "cSocket.h" -#include "cIsThread.h" +#include "Socket.h" +#include "IsThread.h" diff --git a/source/cTCPLink.cpp b/source/OSSupport/TCPLink.cpp index 22151b32a..d4c423b94 100644 --- a/source/cTCPLink.cpp +++ b/source/OSSupport/TCPLink.cpp @@ -1,8 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cTCPLink.h" -#include "cSocket.h" +#include "TCPLink.h" diff --git a/source/cTCPLink.h b/source/OSSupport/TCPLink.h index 0bba84243..7fca10d7f 100644 --- a/source/cTCPLink.h +++ b/source/OSSupport/TCPLink.h @@ -1,6 +1,6 @@ #pragma once -#include "cSocket.h" +#include "Socket.h" class cTCPLink //tolua_export { //tolua_export diff --git a/source/cThread.cpp b/source/OSSupport/Thread.cpp index 3df75f0e7..3df75f0e7 100644 --- a/source/cThread.cpp +++ b/source/OSSupport/Thread.cpp diff --git a/source/cThread.h b/source/OSSupport/Thread.h index 3c9316424..3c9316424 100644 --- a/source/cThread.h +++ b/source/OSSupport/Thread.h diff --git a/source/cTimer.cpp b/source/OSSupport/Timer.cpp index a68ad2480..ab7325b5e 100644 --- a/source/cTimer.cpp +++ b/source/OSSupport/Timer.cpp @@ -1,7 +1,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cTimer.h" +#include "Timer.h" diff --git a/source/cTimer.h b/source/OSSupport/Timer.h index 5969d0fc9..5969d0fc9 100644 --- a/source/cTimer.h +++ b/source/OSSupport/Timer.h |