1
0

Removed a few duplicate includes

git-svn-id: http://mc-server.googlecode.com/svn/trunk@215 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-02-01 12:46:44 +00:00
parent 83fc392198
commit d3614be2e0
10 changed files with 28 additions and 41 deletions

View File

@ -5,14 +5,19 @@
#include "cBlockingTCPLink.h" #include "cBlockingTCPLink.h"
#include "../iniFile/iniFile.h" #include "../iniFile/iniFile.h"
#ifndef _WIN32
#include <cstring>
#endif
#include <sstream> #include <sstream>
extern void ReplaceString( std::string & a_HayStack, const std::string & a_Needle, const std::string & a_ReplaceWith ); extern void ReplaceString( std::string & a_HayStack, const std::string & a_Needle, const std::string & a_ReplaceWith );
cAuthenticator::cAuthenticator() cAuthenticator::cAuthenticator()
{ {
} }

View File

@ -5,11 +5,6 @@
#include "packets/cPacket.h" #include "packets/cPacket.h"
#include "MCSocket.h" #include "MCSocket.h"
#ifndef _WIN32
#include <cstring>
#include <errno.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
#define MSG_NOSIGNAL (0) #define MSG_NOSIGNAL (0)
#endif #endif
@ -17,6 +12,10 @@
#define MSG_NOSIGNAL (0) #define MSG_NOSIGNAL (0)
#endif #endif
cBlockingTCPLink::cBlockingTCPLink() cBlockingTCPLink::cBlockingTCPLink()
: m_Socket( 0 ) : m_Socket( 0 )
{ {

View File

@ -2,8 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#ifndef _WIN32 #ifndef _WIN32
#include <cstring> #include <cstdlib>
#include <cstdlib>
#endif #endif

View File

@ -17,17 +17,9 @@
#include <iostream> #include <iostream>
#ifndef _WIN32 #ifndef _WIN32
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <stdio.h>
#include <sys/stat.h> // for mkdir
#include <sys/types.h>
#else
#include <Windows.h>
#endif #endif
#include <list>
struct ChunkData struct ChunkData
{ {
ChunkData() ChunkData()

View File

@ -9,9 +9,7 @@
#include <math.h> // floorf #include <math.h> // floorf
#ifndef _WIN32 #ifndef _WIN32
#include <cstring> // memcpy
#include <cstdlib> // abs #include <cstdlib> // abs
#include <memory> // auto_ptr
#endif #endif
#include "zlib.h" #include "zlib.h"

View File

@ -7,8 +7,7 @@
#include <sstream> #include <sstream>
#ifndef _WIN32 #ifndef _WIN32
#include <cstring> #include <cstdlib>
#include <cstdlib>
#endif #endif
#include "Defines.h" #include "Defines.h"

View File

@ -17,12 +17,10 @@
#include "../iniFile/iniFile.h" #include "../iniFile/iniFile.h"
#include <iostream> #include <iostream>
#include <time.h>
#include <cstdio>
#ifndef _WIN32
#include <cstring>
#endif
cRoot* cRoot::s_Root = 0; cRoot* cRoot::s_Root = 0;

View File

@ -5,9 +5,9 @@
#include "cSocket.h" #include "cSocket.h"
#include "MCSocket.h" #include "MCSocket.h"
#ifndef _WIN32
#include <cstring>
#endif
#ifdef _WIN32 #ifdef _WIN32
#define MSG_NOSIGNAL (0) #define MSG_NOSIGNAL (0)

View File

@ -35,12 +35,8 @@ documentation and/or software.
/* interface header */ /* interface header */
#include "md5.h" #include "md5.h"
/* system implementation headers */
#include <stdio.h>
#ifndef _WIN32
#include <cstring>
#endif
// Constants for MD5Transform routine. // Constants for MD5Transform routine.

View File

@ -3,12 +3,9 @@
#include "../cSocket.h" #include "../cSocket.h"
#include "../PacketID.h" #include "../PacketID.h"
#ifdef _WIN32
// #include <xstring>
#else
#include <cstring> // Silly Linux doesn't have xstring...
#include <cstdio>
#endif
class cSocket; class cSocket;
class cPacket 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 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 ); static int RecvAll( cSocket & a_Socket, char* a_Data, unsigned int a_Size, int a_Options );
}; };