Merge branch 'master' into jgrpp

# Conflicts:
#	src/debug.cpp

src/debug.cpp

@@ -17,7 +17,7 @@
 #include "fileio_func.h"
 #include "settings_type.h"
 
-#if defined(WIN32) || defined(WIN64)
+#if defined(_WIN32)
 #include "os/windows/win32.h"
 #endif
 
@@ -179,7 +179,7 @@ static void debug_print(const char *dbg, const char *buf)
 	/* do not write desync messages to the console on Windows platforms, as they do
 	 * not seem able to handle text direction change characters in a console without
 	 * crashing, and NetworkTextMessage includes these */
-#if defined(WIN32) || defined(WIN64)
+#if defined(_WIN32)
 	if (strcmp(dbg, "desync") != 0) {
 		TCHAR system_buf[512];
 		convert_to_fs(buffer, system_buf, lengthof(system_buf), true);