Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix NeLNS compile under MinGW

Browse source
This commit is contained in:
kaetemi 2014-06-18 13:03:11 +02:00
parent 75f7b9f931
commit 40854aa5f3
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nelns/login_service/connection_client.cpp
View file

@ -395,11 +395,11 @@ static void cbWSShardChooseShard (CMessage &msgin, const std::string &serviceNam
string addr; string addr;
msgin.serial (addr); msgin.serial (addr);
msgout.serial (addr); msgout.serial (addr);
ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit
return; return;
} }
msgout.serial(reason); msgout.serial(reason);
ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); ClientsServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit
} }
static const TUnifiedCallbackItem WSCallbackArray[] = static const TUnifiedCallbackItem WSCallbackArray[] =

2
code/nelns/login_service/connection_web.cpp
View file

@ -117,7 +117,7 @@ static void cbWSShardChooseShard/* (CMessage &msgin, TSockId from, CCallbackNetB
*/ */
} }
WebServer->send (msgout, (TSockId)cookie.getUserAddr ()); WebServer->send (msgout, (TSockId)cookie.getUserAddr ()); // FIXME: 64-bit
} }
static const TUnifiedCallbackItem WSCallbackArray[] = static const TUnifiedCallbackItem WSCallbackArray[] =

4
code/nelns/login_service/login_service.h
View file

@ -19,7 +19,9 @@
// we have to include windows.h because mysql.h uses it but not include it // we have to include windows.h because mysql.h uses it but not include it
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define NOMINMAX # ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
typedef unsigned long ulong; typedef unsigned long ulong;

4
code/nelns/login_service/mysql_helper.h
View file

@ -24,7 +24,9 @@
// we have to include windows.h because mysql.h uses it but not include it // we have to include windows.h because mysql.h uses it but not include it
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define NOMINMAX # ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
typedef unsigned long ulong; typedef unsigned long ulong;