mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-18 06:58:45 +00:00
Fix NeLNS compile under MinGW
This commit is contained in:
parent
5ae595cb15
commit
22aced6d8d
4 changed files with 9 additions and 5 deletions
|
@ -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[] =
|
||||||
|
|
|
@ -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[] =
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue