Merge branch 'master' into jgrpp

# Conflicts:
#	src/debug.cpp

src/table/win32_settings.ini

@@ -8,14 +8,14 @@
 
 [pre-amble]
 /* win32_v.cpp only settings */
-#if defined(WIN32) && !defined(DEDICATED)
+#if defined(_WIN32) && !defined(DEDICATED)
 extern bool _force_full_redraw, _window_maximize;
 extern uint _display_hz;
 
 static const SettingDescGlobVarList _win32_settings[] = {
 [post-amble]
 };
-#endif /* WIN32 */
+#endif /* _WIN32 */
 [templates]
 SDTG_BOOL = SDTG_BOOL($name,        $flags, $guiflags, $var, $def,                        $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
 SDTG_VAR  =  SDTG_VAR($name, $type, $flags, $guiflags, $var, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL, $orderproc),