Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fixed windows compile

Browse Source
This commit is contained in:
Shauren
2013-05-13 18:10:20 +02:00
parent 6bc144a328
commit 86d846e627
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/shared/Logging/Log.h
View File

@@ -96,14 +96,14 @@ inline bool Log::ShouldLog(LogFilterType type, LogLevel level) const
#define sLog ACE_Singleton<Log, ACE_Thread_Mutex>::instance()
#if PLATFORM != PLATFORM_WINDOWS
# define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \
#if COMPILER != COMPILER_MICROSOFT
#define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \
do { \
if (sLog->ShouldLog(filterType__, level__)) \
sLog->call__(filterType__, __VA_ARGS__); \
} while (0)
#else
# define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \
#define TC_LOG_MESSAGE_BODY(level__, call__, filterType__, ...) \
__pragma(warning(push)) \
__pragma(warning(disable:4127)) \
do { \

19
src/server/worldserver/Main.cpp
View File

@@ -58,15 +58,15 @@ uint32 realmID; ///< Id of the realm
/// Print out the usage string for this program on the console.
void usage(const char *prog)
{
TC_LOG_INFO(LOG_FILTER_WORLDSERVER, "Usage: \n %s [<options>]\n"
" -c config_file use config_file as configuration file\n\r"
#ifdef _WIN32
" Running as service functions:\n\r"
" --service run as service\n\r"
" -s install install service\n\r"
" -s uninstall uninstall service\n\r"
#endif
, prog);
printf("Usage:\n");
printf(" %s [<options>]\n", prog);
printf(" -c config_file use config_file as configuration file\n");
#ifdef _WIN32
printf(" Running as service functions:\n");
printf(" --service run as service\n");
printf(" -s install install service\n");
printf(" -s uninstall uninstall service\n");
#endif
}
/// Launch the Trinity server
@@ -135,6 +135,7 @@ extern int main(int argc, char **argv)
printf("Verify that the file exists and has \'[worldserver]' written in the top of the file!\n");
return 1;
}
TC_LOG_INFO(LOG_FILTER_WORLDSERVER, "Using configuration file %s.", cfg_file);
TC_LOG_INFO(LOG_FILTER_WORLDSERVER, "Using SSL version: %s (library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));