From 38d4524454856aa5c01485b0ff38d676af8fe3a9 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 30 Dec 2022 20:17:26 -0800
Subject: [PATCH] Rename strcasestr to nongnu_strcasestr, macro strcasestr
 ifndef _GNU_SOURCE

Fix for GCC C++ compiler, which always defines _GNU_SOURCE.
---
 src/doomtype.h   | 6 +++---
 src/strcasestr.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/doomtype.h b/src/doomtype.h
index da37bacbe..198162852 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -57,9 +57,9 @@ extern "C" {
 	#define strnicmp(x,y,n) strncasecmp(x,y,n)
 #endif
 
-#ifndef __cplusplus
-char *strcasestr(const char *in, const char *what);
-#define stristr strcasestr
+char *nongnu_strcasestr(const char *in, const char *what);
+#ifndef _GNU_SOURCE
+#define strcasestr nongnu_strcasestr
 #endif
 
 #if defined (PC_DOS) || defined (_WIN32) || defined (__HAIKU__)
diff --git a/src/strcasestr.c b/src/strcasestr.c
index b266278ed..4904fb664 100644
--- a/src/strcasestr.c
+++ b/src/strcasestr.c
@@ -51,7 +51,7 @@ swapp (char ***ppap, char ***ppbp, char **cpap, char **cpbp)
 }
 
 char *
-strcasestr (const char *s, const char *q)
+nongnu_strcasestr (const char *s, const char *q)
 {
 	size_t  qn;