hush warnings about strcat and other redefinitions by undefining them first

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 1306776e50afb2f1dbc81df3df418db636d57cb1..de7eb23804e3d5967812d0483f69dbe92d2c8934 100644 (file)
--- a/common.h
+++ b/common.h
@@ -229,10 +229,16 @@ extern int dpsnprintf (char *buffer, size_t buffersize, const char *format, ...)
 extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args);
 
 // A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them)
 extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list args);
 
 // A bunch of functions are forbidden for security reasons (and also to please MSVS 2005, for some of them)

-#define strcat DO_NOT_USE_STRCAT__USE_STRLCAT
+// LordHavoc: added #undef lines here to avoid warnings in Linux
+#undef strcat
+#define strcat DO_NOT_USE_STRCAT__USE_STRLCAT_OR_MEMCPY
+#undef strncat

 #define strncat DO_NOT_USE_STRNCAT__USE_STRLCAT_OR_MEMCPY
 #define strncat DO_NOT_USE_STRNCAT__USE_STRLCAT_OR_MEMCPY

-//#define strcpy DO_NOT_USE_STRCPY__USE_STRLCPY
+#undef strcpy
+#define strcpy DO_NOT_USE_STRCPY__USE_STRLCPY_OR_MEMCPY
+#undef strncpy

 #define strncpy DO_NOT_USE_STRNCPY__USE_STRLCPY_OR_MEMCPY
 #define strncpy DO_NOT_USE_STRNCPY__USE_STRLCPY_OR_MEMCPY

+//#undef sprintf

 //#define sprintf DO_NOT_USE_SPRINTF__USE_DPSNPRINTF
 
 
 //#define sprintf DO_NOT_USE_SPRINTF__USE_DPSNPRINTF