mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8655] Remove problematic defines from Common.h

Browse source 
Its create conflicts with ACE code.
More cleanup need (with replace use ACE_OS function versions
but stuck for example still used old sockets libarary.
This commit is contained in:
VladimirMangos 2009-10-17 01:02:03 +04:00
parent bc1f6c7d3f
commit 29444467a9
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/shared/Common.h
View file

@ -81,12 +81,6 @@
#include <signal.h> #include <signal.h>
#include <assert.h> #include <assert.h>
#if PLATFORM == PLATFORM_WINDOWS
#define STRCASECMP stricmp
#else
#define STRCASECMP strcasecmp
#endif
#include <set> #include <set>
#include <list> #include <list>
#include <string> #include <string>
@ -103,7 +97,6 @@
#include <ace/RW_Thread_Mutex.h> #include <ace/RW_Thread_Mutex.h>
#include <ace/Thread_Mutex.h> #include <ace/Thread_Mutex.h>
#if PLATFORM == PLATFORM_WINDOWS #if PLATFORM == PLATFORM_WINDOWS
# define FD_SETSIZE 4096 # define FD_SETSIZE 4096
# include <ace/config-all.h> # include <ace/config-all.h>
@ -128,9 +121,7 @@
#define I32FMT "%08I32X" #define I32FMT "%08I32X"
#define I64FMT "%016I64X" #define I64FMT "%016I64X"
#define snprintf _snprintf #define snprintf _snprintf
#define atoll __atoi64
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#define strdup _strdup
#define finite(X) _finite(X) #define finite(X) _finite(X)
#else #else

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8654" #define REVISION_NR "8655"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__