pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified the includes to be a bit clearer.

Browse Source
This commit is contained in:
Arthur Ice 2013-05-20 22:20:01 -07:00
parent dcec112b91
commit 3c11f8f26b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/net.cpp
View File

@ -1,4 +1,3 @@
#define DONT_SHARED_OPCODES
/* EQEMu: Everquest Server Emulator /* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
@ -16,6 +15,9 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define DONT_SHARED_OPCODES
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/features.h" #include "../common/features.h"
#include "../common/queue.h" #include "../common/queue.h"
@ -68,15 +70,12 @@
#ifdef _CRTDBG_MAP_ALLOC #ifdef _CRTDBG_MAP_ALLOC
#undef new #undef new
#endif
#ifdef _CRTDBG_MAP_ALLOC
#define new new(_NORMAL_BLOCK, __FILE__, __LINE__) #define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
#endif #endif
#ifdef _WINDOWS #ifdef _WINDOWS
#include <conio.h> #include <conio.h>
#include <process.h>
#if (_MSC_VER < 1500) #if (_MSC_VER < 1500)
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#endif #endif
@ -84,10 +83,6 @@
#define snprintf _snprintf #define snprintf _snprintf
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#endif
#ifdef _WINDOWS
#include <process.h>
#else #else
#include <pthread.h> #include <pthread.h>
#include "../common/unix.h" #include "../common/unix.h"