From 7de827deb45912d786b0fb2fbc316a82bfc8f24e Mon Sep 17 00:00:00 2001 From: Eidolon Date: Mon, 18 Jul 2022 19:28:52 -0500 Subject: [PATCH] Fix mac crashes + signal handling --- src/http-mserv.c | 2 +- src/sdl/i_system.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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