summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-SVN.txt2
-rw-r--r--src/map/map.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 58a01ed39..c6adfd600 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -2,6 +2,8 @@
Date Added
03/31
+ * Removed some #include's causing warnings on some platforms
+ [SVN 1360: MouseJstr]
* Fixed a bug with InitTimer/StopTimer, thanks to ilpalazzo-sama
* Set 'undead_detect_type' to 0 by default, thanks to Dino9021
* Fixed Enchant Poison / Deadly Poison having too high poisoning chance
diff --git a/src/map/map.h b/src/map/map.h
index 68a2f1d4d..0193c315e 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -816,8 +816,10 @@ extern char *GRF_PATH_FILENAME;
#ifndef TXT_ONLY
// MySQL
+#ifdef __WIN32
#include <my_global.h>
#include <my_sys.h>
+#endif
#include <mysql.h>
void char_online_check(void); // [Valaris]