summaryrefslogtreecommitdiff
path: root/src/common/strlib.h
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-06-19 11:59:28 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-06-19 11:59:28 +0800
commitde7919f0f59f47473e6de709b5d5287a4a55e18d (patch)
tree5967ef231271682ebf9db27185e7e86bbdbc57d4 /src/common/strlib.h
parent98fe7e4770376ca66590b5a1e75ce3a848d032a9 (diff)
parentbd95eccf047bda9d72abcea0724ad34b31131ab0 (diff)
downloadhercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.gz
hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.bz2
hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.xz
hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common/strlib.h')
-rw-r--r--src/common/strlib.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h
index 4a073c3bc..9b1875d45 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -8,9 +8,13 @@
#include "../common/cbasetypes.h"
#include <stdarg.h>
-#define __USE_GNU // required to enable strnlen on some platforms
-#include <string.h>
-#undef __USE_GNU
+#ifndef __USE_GNU
+ #define __USE_GNU // required to enable strnlen on some platforms
+ #include <string.h>
+ #undef __USE_GNU
+#else
+ #include <string.h>
+#endif
#ifdef WIN32
#define HAVE_STRTOK_R