Include win32defines.h before win32.h to fix build errors

src/socket.c

@@ -57,6 +57,8 @@
 
 #ifdef HAVE_SOCKET
 
+#include "win32defines.h" /* should always come before any system headers */
+
 #include "socket.h"
 
 #include "app.h"
@@ -79,7 +81,6 @@
 # include <netinet/in.h>
 # include <glib/gstdio.h>
 #else
-# include "win32defines.h"
 # include <winsock2.h>
 # include <windows.h>
 # include <gdk/gdkwin32.h>

src/spawn.c

@@ -43,13 +43,14 @@
 # include "config.h"
 #endif
 
+#include "win32defines.h" /* should always come before any system headers */
+
 #include <errno.h>
 #include <string.h>
 
 #include "spawn.h"
 
 #ifdef G_OS_WIN32
-# include "win32defines.h"
 # include <ctype.h>    /* isspace() */
 # include <fcntl.h>    /* _O_RDONLY, _O_WRONLY */
 # include <io.h>       /* _open_osfhandle, _close */

src/win32.c

@@ -27,12 +27,12 @@
 # include "config.h"
 #endif
 
+#include "win32defines.h" /* should always come before any system headers */
+
 #include "win32.h"
 
 #ifdef G_OS_WIN32
 
-#include "win32defines.h"
-
 #include "dialogs.h"
 #include "document.h"
 #include "editor.h"

src/win32defines.h

@@ -25,6 +25,7 @@
 #define WIN32_LEAN_AND_MEAN
 /* Need Windows XP for SHGetFolderPathAndSubDirW */
 #define WINVER 0x0501
+#define _WIN32_WINNT 0x0501
 /* Needed for SHGFP_TYPE */
 #define _WIN32_IE 0x0500