From d91e72a82596e163516b8fc36a8a895e3c90c06b Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 22 Sep 2012 21:00:31 +0000 Subject: [PATCH] - windows compile bugfixes --- source/glest_game/main/main.cpp | 4 +++- source/shared_lib/sources/platform/posix/socket.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 12cfac9af..4f4889ce6 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -103,7 +103,9 @@ static bool gameInitialized = false; static Program *mainProgram = NULL; static FileCRCPreCacheThread *preCacheThread = NULL; -//static string runtimeErrorMsg = ""; +#ifdef WIN32 +static string runtimeErrorMsg = ""; +#endif void cleanupCRCThread() { if(preCacheThread != NULL) { diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index f226870d0..1b4c509c2 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -349,7 +349,6 @@ void Ip::Inet_NtoA(uint32 addr, char * ipbuf) } // convert a string represenation of an IP address into its numeric equivalent -/* static uint32 Inet_AtoN(const char * buf) { // 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; } -*/ + /* static void PrintNetworkInterfaceInfos() {