From 402fedb1471a70de32f415815e7e0d34b328a072 Mon Sep 17 00:00:00 2001 From: Shpoike Date: Fri, 19 Jun 2020 23:13:30 +0100 Subject: [PATCH] Try to fix compiling in msvc, and try to avoid the issue in future too. --- Quake/common.h | 5 +++++ Quake/gl_texmgr.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Quake/common.h b/Quake/common.h index d962875b..e90fa8e3 100644 --- a/Quake/common.h +++ b/Quake/common.h @@ -159,6 +159,11 @@ extern char *q_strupr (char *str); extern int q_snprintf (char *str, size_t size, const char *format, ...) FUNC_PRINTF(3,4); extern int q_vsnprintf(char *str, size_t size, const char *format, va_list args) FUNC_PRINTF(3,0); +#define strcasecmp brokeninmsvc +#define stricmp brokenportability +#define strncasecmp brokeninmsvc +#define strnicmp brokenportability + //============================================================================ extern char com_token[1024]; diff --git a/Quake/gl_texmgr.c b/Quake/gl_texmgr.c index 3d41a72e..97f58be2 100644 --- a/Quake/gl_texmgr.c +++ b/Quake/gl_texmgr.c @@ -1214,7 +1214,7 @@ enum srcformat TexMgr_FormatForName (const char *code) { if (!compressedformats[i].formatname) continue; - if (!strcasecmp(code, compressedformats[i].formatname)) + if (!q_strcasecmp(code, compressedformats[i].formatname)) return i; } return SRC_EXTERNAL; @@ -1226,7 +1226,7 @@ enum srcformat TexMgr_FormatForCode (const char *code) { if (!compressedformats[i].mipextname) continue; - if (!strncasecmp(code, compressedformats[i].mipextname, 4)) + if (!q_strncasecmp(code, compressedformats[i].mipextname, 4)) return i; } return SRC_EXTERNAL;