From ffaffe3fd753b0afc75679c9730276871a9d034a Mon Sep 17 00:00:00 2001
From: Xanadu <none@none>
Date: Wed, 23 Jun 2010 01:47:41 +0200
Subject: * Renamed several VS projects and the executables they produce to
 reflect the new naming convention. * Cleaned up some useless and redundant
 preprocessor definitions. * Fixed the win build so that it correctly uses the
 mysql lib it built from the sources. * Note that you still need to use
 8615_mysql_openssl_libs.zip for the OpenSSL binaries. * Also note that Win
 x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
---
 src/server/authserver/Main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/server/authserver/Main.cpp')

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 7dbb1c95b5b..46ea2b38212 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -45,7 +45,7 @@
 # define _TRINITY_REALM_CONFIG  "authserver.conf"
 #endif //_TRINITY_REALM_CONFIG
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 char serviceName[] = "TrinityRealm";
 char serviceLongName[] = "Trinity realm service";
@@ -92,7 +92,7 @@ void usage(const char *prog)
 {
     sLog.outString("Usage: \n %s [<options>]\n"
         "    -c config_file           use config_file as configuration file\n\r"
-        #ifdef WIN32
+        #ifdef _WIN32
         "    Running as service functions:\n\r"
         "    --service                run as service\n\r"
         "    -s install               install service\n\r"
@@ -122,7 +122,7 @@ extern int main(int argc, char **argv)
                 cfg_file = argv[c];
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         ////////////
         //Services//
         ////////////
@@ -243,7 +243,7 @@ extern int main(int argc, char **argv)
     #endif /* _WIN32 */();
 
     ///- Handle affinity for multiple processors and process priority on Windows
-    #ifdef WIN32
+    #ifdef _WIN32
     {
         HANDLE hProcess = GetCurrentProcess();
 
@@ -315,7 +315,7 @@ extern int main(int argc, char **argv)
             sLog.outDetail("Ping MySQL to keep connection alive");
             LoginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
         }
-#ifdef WIN32
+#ifdef _WIN32
         if (m_ServiceStatus == 0) stopEvent = true;
         while (m_ServiceStatus == 2) Sleep(1000);
 #endif
-- 
cgit v1.2.3