Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- windows compile bugfixes

Browse Source
This commit is contained in:
Mark Vejvoda 2012-09-22 21:00:31 +00:00
parent e0bf4df646
commit d91e72a825
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/main/main.cpp
View File

@ -103,7 +103,9 @@ static bool gameInitialized = false;
static Program *mainProgram = NULL; static Program *mainProgram = NULL;
static FileCRCPreCacheThread *preCacheThread = NULL; static FileCRCPreCacheThread *preCacheThread = NULL;
//static string runtimeErrorMsg = ""; #ifdef WIN32
static string runtimeErrorMsg = "";
#endif
void cleanupCRCThread() { void cleanupCRCThread() {
if(preCacheThread != NULL) { if(preCacheThread != NULL) {

3
source/shared_lib/sources/platform/posix/socket.cpp
View File

@ -349,7 +349,6 @@ void Ip::Inet_NtoA(uint32 addr, char * ipbuf)
} }
// convert a string represenation of an IP address into its numeric equivalent // convert a string represenation of an IP address into its numeric equivalent
/*
static uint32 Inet_AtoN(const char * buf) static uint32 Inet_AtoN(const char * buf)
{ {
// net_server inexplicably doesn't have this function; so I'll just fake it // net_server inexplicably doesn't have this function; so I'll just fake it
@ -369,7 +368,7 @@ static uint32 Inet_AtoN(const char * buf)
} }
return ret; return ret;
} }
*/
/* /*
static void PrintNetworkInterfaceInfos() static void PrintNetworkInterfaceInfos()
{ {