Fixed TrinityRealm compile on windows

Fixed shared build on windows fully

NOTE: TrinityRealm config file has been renamed to authserver.conf!

--HG--
branch : trunk

3 files changed, 7 insertions, 2 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 4d5362608a7..7dbb1c95b5b 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -42,7 +42,7 @@
 #include <openssl/crypto.h>
 
 #ifndef _TRINITY_REALM_CONFIG
-# define _TRINITY_REALM_CONFIG  "TrinityRealm.conf"
+# define _TRINITY_REALM_CONFIG  "authserver.conf"
 #endif //_TRINITY_REALM_CONFIG
 
 #ifdef WIN32
diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h
index dd9d4c68d26..8749fba9def 100644
--- a/src/server/authserver/Server/RealmSocket.h
+++ b/src/server/authserver/Server/RealmSocket.h
@@ -25,11 +25,11 @@
 #ifndef __REALMSOCKET_H__
 #define __REALMSOCKET_H__
 
-#include <ace/Basic_Types.h>
 #include <ace/Synch_Traits.h>
 #include <ace/Svc_Handler.h>
 #include <ace/SOCK_Stream.h>
 #include <ace/Message_Block.h>
+#include <ace/Basic_Types.h>
 
 class RealmSocket : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index 2c1df2ff483..513dd64b505 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -26,6 +26,11 @@
 #include <windows.h>
 #include <winsvc.h>
 
+// stupid ACE define
+#ifdef main
+#undef main
+#endif //main
+
 #if !defined(WINADVAPI)
 #if !defined(_ADVAPI32_)
 #define WINADVAPI DECLSPEC_IMPORT