Merge branch 'master' into jgrpp

# Conflicts: # src/debug.cpp
2019-01-02 16:09:44 +00:00
parent afae7ca810 391bc45c41
commit 4f1d54564e
40 changed files with 491 additions and 467 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1795,9 +1795,9 @@ static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescP
 {
 	if (basic_settings) {
 		proc(ini, (const SettingDesc*)_misc_settings,    "misc",  NULL);
-#if defined(WIN32) && !defined(DEDICATED)
+#if defined(_WIN32) && !defined(DEDICATED)
 		proc(ini, (const SettingDesc*)_win32_settings,   "win32", NULL);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 	}

 	if (other_settings) {