Fix MinGW build

This commit is contained in:
lewa_j
2018-05-13 23:25:51 +03:00
parent 42b4e456a2
commit 43b746d2f8
6 changed files with 20 additions and 12 deletions
+2 -1
View File
@@ -425,7 +425,8 @@ typedef struct
typedef struct host_parm_s
{
HINSTANCE hInst;
HANDLE hMutex;
host_status_t status; // global host state
game_status_t game; // game manager
uint type; // running at
+7 -1
View File
@@ -103,6 +103,11 @@ static dllfunc_t winsock_funcs[] =
dll_info_t winsock_dll = { "wsock32.dll", winsock_funcs, false };
static void (_stdcall *pInitializeCriticalSection)( void* );
static void (_stdcall *pEnterCriticalSection)( void* );
static void (_stdcall *pLeaveCriticalSection)( void* );
static void (_stdcall *pDeleteCriticalSection)( void* );
static dllfunc_t kernel32_funcs[] =
{
{ "InitializeCriticalSection", (void **) &pInitializeCriticalSection },
@@ -1429,9 +1434,10 @@ void NET_SendPacket( netsrc_t sock, size_t length, const void *data, netadr_t to
if( NET_IsSocketError( ret ))
{
int err = 0;
{
#ifdef _WIN32
int err = pWSAGetLastError();
err = pWSAGetLastError();
// WSAEWOULDBLOCK is silent
if( err == WSAEWOULDBLOCK )
+5 -5
View File
@@ -538,7 +538,7 @@ void Sys_WaitForQuit( void )
#ifdef _WIN32
MSG msg;
Con_RegisterHotkeys();
Wcon_RegisterHotkeys();
msg.message = 0;
@@ -616,8 +616,8 @@ void Sys_Error( const char *error, ... )
if( host_developer.value )
{
#ifdef _WIN32
Con_ShowConsole( true );
Con_DisableInput(); // disable input line for dedicated server
Wcon_ShowConsole( true );
Wcon_DisableInput(); // disable input line for dedicated server
#endif
Sys_Print( text ); // print error message
Sys_WaitForQuit();
@@ -625,7 +625,7 @@ void Sys_Error( const char *error, ... )
else
{
#ifdef _WIN32
Con_ShowConsole( false );
Wcon_ShowConsole( false );
#endif
MSGBOX( text );
}
@@ -730,7 +730,7 @@ void Sys_Print( const char *pMsg )
*b = *c = 0; // terminator
Con_WinPrint( buffer );
Wcon_WinPrint( buffer );
}
#endif