diff --git a/src/http-mserv.c b/src/http-mserv.c index e925c50d5..919acf330 100644 --- a/src/http-mserv.c +++ b/src/http-mserv.c @@ -138,7 +138,7 @@ HMS_connect (const char *format, ...) return NULL; } - if (cv_masterserver_token.string[0]) + if (cv_masterserver_token.string && cv_masterserver_token.string[0]) { quack_token = curl_easy_escape(curl, cv_masterserver_token.string, 0); token_length = ( sizeof "&token="-1 )+ strlen(quack_token); diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 7ec85e5d6..8cb479b86 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -102,7 +102,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #endif #endif -#if (defined (__unix__) && !defined (_MSDOS)) || defined (UNIXCOMMON) +#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) #include #include #define NEWSIGNALHANDLER