pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for compile issues on windows (bad perl bad)

Browse Source
This commit is contained in:
KimLS 2019-07-08 19:26:21 -07:00
parent d8f34651de
commit 8c75cf1ff5
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/dbcore.cpp
View File

@ -2,8 +2,9 @@
#include <winsock2.h> #include <winsock2.h>
#endif #endif
#include "../common/misc_functions.h" #include "misc_functions.h"
#include "../common/eqemu_logsys.h" #include "eqemu_logsys.h"
#include "timer.h"
#include "dbcore.h" #include "dbcore.h"
@ -21,7 +22,6 @@
#else #else
#include "unix.h" #include "unix.h"
#include "timer.h"
#include <pthread.h> #include <pthread.h>
#endif #endif

7
common/eqemu_logsys.cpp
View File

@ -468,9 +468,10 @@ void EQEmuLogSys::Out(
prefix = fmt::format("[{0}::{1}:{2}] ", base_file_name(file), func, line); prefix = fmt::format("[{0}::{1}:{2}] ", base_file_name(file), func, line);
} }
auto msg_cstr = message.c_str();
va_list args; va_list args;
va_start(args, message); va_start(args, msg_cstr);
std::string output_message = vStringFormat(message.c_str(), args); std::string output_message = vStringFormat(msg_cstr, args);
va_end(args); va_end(args);
std::string output_debug_message = EQEmuLogSys::FormatOutMessageString(log_category, prefix + output_message); std::string output_debug_message = EQEmuLogSys::FormatOutMessageString(log_category, prefix + output_message);
@ -597,4 +598,4 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
std::ios_base::app | std::ios_base::out std::ios_base::app | std::ios_base::out
); );
} }
} }

9
common/eqemu_logsys.h
View File

@ -21,11 +21,18 @@
#ifndef EQEMU_LOGSYS_H #ifndef EQEMU_LOGSYS_H
#define EQEMU_LOGSYS_H #define EQEMU_LOGSYS_H
#include <fmt/format.h>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <stdio.h> #include <stdio.h>
#include <functional> #include <functional>
#ifdef _WIN32
#ifdef utf16_to_utf8
#undef utf16_to_utf8
#endif
#endif
#include <fmt/format.h>
#include "types.h" #include "types.h"
namespace Logs { namespace Logs {