pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

on windows use _getpid instead of getpid

Browse Source 
getpid is deprecated on windows, removes the deprecation warning.
This commit is contained in:
Arthur Ice
2014-04-10 15:28:03 -07:00
parent 79f5a21643
commit b2c9ba5bff
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/debug.cpp
+9 -5
View File
@@ -12,7 +12,7 @@
#define strcasecmp _stricmp #define strcasecmp _stricmp
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
@@ -112,7 +112,11 @@ bool EQEMuLog::open(LogIDs id) {
char filename[200]; char filename[200];
#ifndef NO_PIDLOG #ifndef NO_PIDLOG
snprintf(filename, sizeof(filename), "%s%s_%04i.log", FileNames[id], exename, getpid()); #ifdef _WINDOWS
snprintf(filename, sizeof(filename), "%s%s_%04i.log", FileNames[id], exename, _getpid());
#else
snprintf(filename, sizeof(filename), "%s%s_%04i.log", FileNames[id], exename, getpid());
#endif
#else #else
snprintf(filename, sizeof(filename), "%s%s.log", FileNames[id], exename); snprintf(filename, sizeof(filename), "%s%s.log", FileNames[id], exename);
#endif #endif
@@ -356,8 +360,8 @@ bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 ski
write(id, "Dumping Packet: %i", size); write(id, "Dumping Packet: %i", size);
// Output as HEX // Output as HEX
int beginningOfLineOffset = 0; int beginningOfLineOffset = 0;
uint32 indexInData; uint32 indexInData;
std::string asciiOutput; std::string asciiOutput;
@@ -377,7 +381,7 @@ bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 ski
if (data[indexInData] >= 32 && data[indexInData] < 127) if (data[indexInData] >= 32 && data[indexInData] < 127)
{ {
// According to http://msdn.microsoft.com/en-us/library/vstudio/ee404875(v=vs.100).aspx // According to http://msdn.microsoft.com/en-us/library/vstudio/ee404875(v=vs.100).aspx
// Visual Studio 2010 doesn't have std::to_string(int) but it does have the long long // Visual Studio 2010 doesn't have std::to_string(int) but it does have the long long
// version. // version.
asciiOutput.append(std::to_string((long long)data[indexInData])); asciiOutput.append(std::to_string((long long)data[indexInData]));
} }