[9337] Use ACE PATH_MAX define magic

mangos · Feb 9, 2010 · ebc6c9f · ebc6c9f · NetSky · Feb 9, 2010
1 parent f1fb382
commit ebc6c9f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h
@@ -203,7 +203,9 @@ namespace SOCKETS_NAMESPACE {
 
 // 1.8.6: define FD_SETSIZE to something bigger than 64 if there are a lot of
 // simultaneous connections (must be done before including winsock.h)
+#ifndef FD_SETSIZE
 #define FD_SETSIZE 1024
+#endif
 
 // windows 2000 with ipv6 preview installed:
 //    http://msdn.microsoft.com/downloads/sdks/platform/tpipv6.asp

diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
@@ -48,10 +48,11 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
 #define MANGOS_CLOSE_LIBRARY(hlib)      ACE_OS::dlclose(hlib)
 #define MANGOS_GET_PROC_ADDR(hlib,name) ACE_OS::dlsym(hlib,name)
 
+#define MANGOS_PATH_MAX PATH_MAX                            // ace/os_include/os_limits.h -> ace/Basic_Types.h
+
 #if PLATFORM == PLATFORM_WINDOWS
 #  define MANGOS_EXPORT __declspec(dllexport)
 #  define MANGOS_IMPORT __cdecl
-#  define MANGOS_PATH_MAX MAX_PATH
 #else //PLATFORM != PLATFORM_WINDOWS
 #  define MANGOS_EXPORT export
 #  if defined(__APPLE_CC__) && defined(BIG_ENDIAN)
@@ -61,7 +62,6 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
 #  else
 #    define MANGOS_IMPORT __attribute__ ((cdecl))
 #  endif //__APPLE_CC__ && BIG_ENDIAN
-#  define MANGOS_PATH_MAX PATH_MAX
 #endif //PLATFORM
 
 #if PLATFORM == PLATFORM_WINDOWS

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
@@ -7348,7 +7348,7 @@ bool PlayerCondition::Meets(Player const * player) const
         case CONDITION_REPUTATION_RANK:
         {
             FactionEntry const* faction = sFactionStore.LookupEntry(value1);
-            return faction && player->GetReputationMgr().GetRank(faction) >= int32(value2);
+            return faction && player->GetReputationMgr().GetRank(faction) >= ReputationRank(value2);
         }
         case CONDITION_TEAM:
             return player->GetTeam() == value1;

diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp
@@ -3,7 +3,6 @@
 #include <ace/OS_NS_stdlib.h>
 
 #ifdef WIN32
-#  define PATH_MAX _MAX_PATH
 #  define strcasecmp stricmp
 #  include <io.h>
 #else
@@ -403,7 +402,7 @@ int DOTCONFDocument::checkConfig(const NodeList::iterator& from)
 int DOTCONFDocument::setContent(const char* _fileName)
 {
     int ret = 0;
-    char realpathBuf[PATH_MAX];
+    char realpathBuf[MANGOS_PATH_MAX];
 
     if (ACE_OS::realpath(_fileName, realpathBuf) == NULL)
     {

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9336"
+ #define REVISION_NR "9337"
 #endif // __REVISION_NR_H__