Merge commit 'c5a6237a2b002c9811719172931b0c9cc5a725f4' into master-merge

[xonotic/netradiant.git] / tools / quake2 / extra / common / cmdlib.c

diff --git a/tools/quake2/extra/common/cmdlib.c b/tools/quake2/extra/common/cmdlib.c
index 792690790530546297e0254c17cc776dd40c8505..ab900c9033d03bce773e3c9396c560f64bea96bd 100644 (file)
--- a/tools/quake2/extra/common/cmdlib.c
+++ b/tools/quake2/extra/common/cmdlib.c
@@ -461,7 +461,8 @@ int Q_strcasecmp (char *s1, char *s2)
        return Q_strncasecmp (s1, s2, 99999);
 }
 
-
+// May be already defined with some compilers on Windows
+#ifndef strupr
 char *strupr (char *start)
 {
        char    *in;
@@ -473,6 +474,7 @@ char *strupr (char *start)
        }
        return start;
 }
+#endif
 
 char *strlower (char *start)
 {