Merge commit 'b681f28130ff2e9789253eff1c1d41163e427eaa' into master-merge

[xonotic/netradiant.git] / tools / heretic2 / common / cmdlib.c

diff --git a/tools/heretic2/common/cmdlib.c b/tools/heretic2/common/cmdlib.c
index c45ff161bf0232491c73745c8b9e171ec925ff5b..244452272c09a2e81c2ab024db56e89ef327db4a 100644 (file)
--- a/tools/heretic2/common/cmdlib.c
+++ b/tools/heretic2/common/cmdlib.c
@@ -50,8 +50,6 @@ qboolean g_dokeypress = false;
 
 qboolean g_nomkdir = false;
 
-
-#ifdef SAFE_MALLOC
 void *safe_malloc( size_t size ){
        void *p;
 
@@ -73,7 +71,6 @@ void *safe_malloc_info( size_t size, char* info ){
 
        return p;
 }
-#endif // !SAFE_MALLOC
 
 void *SafeMalloc( size_t n, char *desc ){
        void *p;
@@ -499,22 +496,20 @@ int Q_strcasecmp( const char *s1, const char *s2 ){
        return Q_strncasecmp( s1, s2, 99999 );
 }
 
-// NOTE TTimo when switching to Multithread DLL (Release/Debug) in the config
-//   started getting warnings about that function, prolly a duplicate with the runtime function
-//   maybe we still need to have it in linux builds
-/*
-   char *strupr (char *start)
-   {
-    char       *in;
-    in = start;
-    while (*in)
-    {
-   *in = toupper(*in);
-        in++;
-    }
-    return start;
-   }
- */
+// May be already defined with some compilers on Windows
+#ifndef strupr
+char *strupr (char *start)
+{
+       char    *in;
+       in = start;
+       while (*in)
+       {
+               *in = toupper(*in);
+               in++;
+       }
+       return start;
+}
+#endif
 
 char *strlower( char *start ){
        char    *in;