diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-01 13:46:44 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-01 13:46:44 +0100 |
| commit | d3614be2e07baa6c1d7cebbab5e260481fbb2de9 (patch) | |
| tree | fecabfb0d36c4e36a81f04bd1fde8f27fc1fb536 | |
| parent | new cIsThread object for thread encapsulation (diff) | |
| download | cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.tar cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.tar.gz cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.tar.bz2 cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.tar.lz cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.tar.xz cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.tar.zst cuberite-d3614be2e07baa6c1d7cebbab5e260481fbb2de9.zip | |
| -rw-r--r-- | source/cAuthenticator.cpp | 11 | ||||
| -rw-r--r-- | source/cBlockingTCPLink.cpp | 9 | ||||
| -rw-r--r-- | source/cChunk.cpp | 3 | ||||
| -rw-r--r-- | source/cChunkLoader.cpp | 8 | ||||
| -rw-r--r-- | source/cChunkMap.cpp | 2 | ||||
| -rw-r--r-- | source/cRecipeChecker.cpp | 3 | ||||
| -rw-r--r-- | source/cRoot.cpp | 8 | ||||
| -rw-r--r-- | source/cTCPLink.cpp | 6 | ||||
| -rw-r--r-- | source/md5/md5.cpp | 6 | ||||
| -rw-r--r-- | source/packets/cPacket.h | 13 |
10 files changed, 28 insertions, 41 deletions
diff --git a/source/cAuthenticator.cpp b/source/cAuthenticator.cpp index 168ace7b5..83b2695a4 100644 --- a/source/cAuthenticator.cpp +++ b/source/cAuthenticator.cpp @@ -5,14 +5,19 @@ #include "cBlockingTCPLink.h"
#include "../iniFile/iniFile.h"
-#ifndef _WIN32
-#include <cstring>
-#endif
#include <sstream>
+
+
+
+
extern void ReplaceString( std::string & a_HayStack, const std::string & a_Needle, const std::string & a_ReplaceWith );
+
+
+
+
cAuthenticator::cAuthenticator()
{
}
diff --git a/source/cBlockingTCPLink.cpp b/source/cBlockingTCPLink.cpp index 19026321e..d436a52cf 100644 --- a/source/cBlockingTCPLink.cpp +++ b/source/cBlockingTCPLink.cpp @@ -5,11 +5,6 @@ #include "packets/cPacket.h"
#include "MCSocket.h"
-#ifndef _WIN32
- #include <cstring>
- #include <errno.h>
-#endif
-
#ifdef _WIN32
#define MSG_NOSIGNAL (0)
#endif
@@ -17,6 +12,10 @@ #define MSG_NOSIGNAL (0)
#endif
+
+
+
+
cBlockingTCPLink::cBlockingTCPLink()
: m_Socket( 0 )
{
diff --git a/source/cChunk.cpp b/source/cChunk.cpp index abe1d0443..992a4e71a 100644 --- a/source/cChunk.cpp +++ b/source/cChunk.cpp @@ -2,8 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#ifndef _WIN32
-#include <cstring>
-#include <cstdlib>
+ #include <cstdlib>
#endif
diff --git a/source/cChunkLoader.cpp b/source/cChunkLoader.cpp index e5220575c..94ce6153d 100644 --- a/source/cChunkLoader.cpp +++ b/source/cChunkLoader.cpp @@ -17,17 +17,9 @@ #include <iostream>
#ifndef _WIN32
-#include <cstring>
#include <cstdlib>
-#include <stdio.h>
-#include <sys/stat.h> // for mkdir
-#include <sys/types.h>
-#else
-#include <Windows.h>
#endif
-#include <list>
-
struct ChunkData
{
ChunkData()
diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp index 4e9fd5c62..8e2257858 100644 --- a/source/cChunkMap.cpp +++ b/source/cChunkMap.cpp @@ -9,9 +9,7 @@ #include <math.h> // floorf
#ifndef _WIN32
- #include <cstring> // memcpy
#include <cstdlib> // abs
- #include <memory> // auto_ptr
#endif
#include "zlib.h"
diff --git a/source/cRecipeChecker.cpp b/source/cRecipeChecker.cpp index ac90c7a00..7db1f9643 100644 --- a/source/cRecipeChecker.cpp +++ b/source/cRecipeChecker.cpp @@ -7,8 +7,7 @@ #include <sstream>
#ifndef _WIN32
-#include <cstring>
-#include <cstdlib>
+ #include <cstdlib>
#endif
#include "Defines.h"
diff --git a/source/cRoot.cpp b/source/cRoot.cpp index 4f6dec035..73f5a6397 100644 --- a/source/cRoot.cpp +++ b/source/cRoot.cpp @@ -17,12 +17,10 @@ #include "../iniFile/iniFile.h"
#include <iostream>
-#include <time.h>
-#include <cstdio>
-#ifndef _WIN32
-#include <cstring>
-#endif
+
+
+
cRoot* cRoot::s_Root = 0;
diff --git a/source/cTCPLink.cpp b/source/cTCPLink.cpp index 65cb0c028..19f04f4ee 100644 --- a/source/cTCPLink.cpp +++ b/source/cTCPLink.cpp @@ -5,9 +5,9 @@ #include "cSocket.h"
#include "MCSocket.h"
-#ifndef _WIN32
- #include <cstring>
-#endif
+
+
+
#ifdef _WIN32
#define MSG_NOSIGNAL (0)
diff --git a/source/md5/md5.cpp b/source/md5/md5.cpp index 534020219..2b9e10c9f 100644 --- a/source/md5/md5.cpp +++ b/source/md5/md5.cpp @@ -35,12 +35,8 @@ documentation and/or software. /* interface header */
#include "md5.h"
-/* system implementation headers */
-#include <stdio.h>
-#ifndef _WIN32
-#include <cstring>
-#endif
+
// Constants for MD5Transform routine.
diff --git a/source/packets/cPacket.h b/source/packets/cPacket.h index 3d6f812a9..7d85afc97 100644 --- a/source/packets/cPacket.h +++ b/source/packets/cPacket.h @@ -3,12 +3,9 @@ #include "../cSocket.h"
#include "../PacketID.h"
-#ifdef _WIN32
- // #include <xstring>
-#else
- #include <cstring> // Silly Linux doesn't have xstring...
- #include <cstdio>
-#endif
+
+
+
class cSocket;
class cPacket
@@ -55,3 +52,7 @@ public: static int SendData( cSocket & a_Socket, const char* a_Message, unsigned int a_Size, int a_Options );
static int RecvAll( cSocket & a_Socket, char* a_Data, unsigned int a_Size, int a_Options );
};
+
+
+
+
|