From 9c346fc0a907f911cbe28780198072cbea7fd461 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Tue, 9 Feb 2010 03:31:05 +0300
Subject: [PATCH] [9337] Use ACE PATH_MAX define magic

---
 dep/include/sockets/socket_include.h      | 2 ++
 src/framework/Platform/Define.h           | 4 ++--
 src/game/ObjectMgr.cpp                    | 2 +-
 src/shared/Config/dotconfpp/dotconfpp.cpp | 3 +--
 src/shared/revision_nr.h                  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h
index b2d55bc19..16cfe3f04 100644
--- 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
index ff00bec4a..38c3ccb59 100644
--- 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
index 300511d1c..45776e790 100644
--- 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
index 3ee0a4d73..85b515032 100644
--- 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
index 929a97952..7659088bb 100644
--- 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__