summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-06-14 13:33:02 -0300
committershennetsind <ind@henn.et>2013-06-14 13:33:02 -0300
commit634bcc63b7adff53d817c19195c4060170eeecfc (patch)
tree9a06b87975ffb857906428f208113113c1fc8f74
parent203dd2affa34f90c1ba037d4081494d26613ce4d (diff)
downloadhercules-634bcc63b7adff53d817c19195c4060170eeecfc.tar.gz
hercules-634bcc63b7adff53d817c19195c4060170eeecfc.tar.bz2
hercules-634bcc63b7adff53d817c19195c4060170eeecfc.tar.xz
hercules-634bcc63b7adff53d817c19195c4060170eeecfc.zip
Fixed the '"__USE_GNU" redefined' warnings on selected platforms
Special Thanks to Takkun~! Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/common/strlib.h10
-rw-r--r--src/plugins/db2sql.c12
2 files changed, 13 insertions, 9 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
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index d56fd9546..723a3cc94 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -1,18 +1,18 @@
// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
// See the LICENSE file
-#include <stdio.h>
-#include <stdlib.h>
-#include "../config/core.h"
-#include "../common/HPMi.h"
+#include "../common/cbasetypes.h"
#include "../common/strlib.h"
-#include "../common/SQL.h"
#include "../common/timer.h"
+#include "../common/HPMi.h"
+#include "../common/mmo.h"
+#include "../config/core.h"
#include "../map/clif.h"
#include "../map/pc.h"
#include "../map/map.h"
#include "../map/itemdb.h"
-
+#include <stdio.h>
+#include <stdlib.h>
HPExport struct hplugin_info pinfo = {
"DB2SQL", // Plugin name