From 018afede9aebbf2ec2d592ca02758f5a8a61568d Mon Sep 17 00:00:00 2001 From: Spoike Date: Thu, 5 Sep 2019 00:01:01 +0000 Subject: [PATCH] Compile fixes (mostly focused on windows) git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5534 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/bothdefs.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h index 4d2b09fa0..ff3c33335 100644 --- a/engine/common/bothdefs.h +++ b/engine/common/bothdefs.h @@ -783,14 +783,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define FTE_UNREACHABLE Sys_Error("Unreachable reached: %s %i\n", __FILE__, __LINE__) #endif -#ifdef _WIN32 - //Windows-specific... - #define stricmp _stricmp - #define strnicmp _strnicmp -#else - //Posix - #define stricmp strcasecmp - #define strnicmp strncasecmp +#ifndef stricmp + #ifdef _WIN32 + //Windows-specific... + #define stricmp _stricmp + #define strnicmp _strnicmp + #else + //Posix + #define stricmp strcasecmp + #define strnicmp strncasecmp + #endif #endif