From e0f47be9d0d86a07faaf8eb74409592f2cdaecf3 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Tue, 18 Jan 2011 00:22:36 +0100
Subject: [PATCH] Clean up the way windows headers are included

Plus make inclusion order a little more consistent in general
---
 src/node.cc                     | 15 ++++++-------
 src/node_buffer.cc              | 14 ++++++++-----
 src/node_child_process.h        |  3 ++-
 src/node_child_process_win32.cc | 12 ++---------
 src/node_constants.cc           |  4 ++--
 src/node_file.cc                |  2 +-
 src/node_net.cc                 | 22 ++++++++++----------
 src/node_os.cc                  | 16 +++++++-------
 src/node_stdio_win32.cc         |  8 +++++--
 src/platform_win32.cc           | 12 ++++++-----
 src/platform_win32.h            | 37 +++++++++++++++++++++++++++++++--
 src/platform_win32_winsock.cc   |  6 ------
 src/platform_win32_winsock.h    |  9 +++++---
 13 files changed, 98 insertions(+), 62 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index bab02aaa9c..5faa313c78 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1,8 +1,10 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
+
 #include <node.h>
 
-#include <locale.h>
+#include <v8-debug.h>
 
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -14,17 +16,18 @@
 #include <sys/types.h>
 #include <unistd.h> /* setuid, getuid */
 
-#include "platform.h"
-
 #ifdef __MINGW32__
 # include <platform_win32.h> /* winapi_perror() */
 # include <platform_win32_winsock.h> /* wsa_init() */
-#else // __POSIX__
+#endif
+
+#ifdef __POSIX__
 # include <dlfcn.h> /* dlopen(), dlsym() */
 # include <pwd.h> /* getpwnam() */
 # include <grp.h> /* getgrnam() */
 #endif
 
+#include <platform.h>
 #include <node_buffer.h>
 #include <node_io_watcher.h>
 #include <node_net.h>
@@ -45,12 +48,10 @@
 #include <node_javascript.h>
 #include <node_version.h>
 #ifdef HAVE_OPENSSL
-#include <node_crypto.h>
+# include <node_crypto.h>
 #endif
 #include <node_script.h>
 
-#include <v8-debug.h>
-
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
 
 using namespace v8;
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index ba74abcc5f..2c19662121 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -1,18 +1,22 @@
+
+#include <node.h>
 #include <node_buffer.h>
 
-#include <assert.h>
-#include <stdlib.h> // malloc, free
 #include <v8.h>
 
+#include <assert.h>
+#include <stdlib.h> // malloc, free
 #include <string.h> // memcpy
 
 #ifdef __MINGW32__
-# include <winsock2.h> // htons, htonl
-#else // __POSIX__
+# include <platform.h>
+# include <platform_win32_winsock.h> // htons, htonl
+#endif
+
+#ifdef __POSIX__
 # include <arpa/inet.h> // htons, htonl
 #endif
 
-#include <node.h>
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/src/node_child_process.h b/src/node_child_process.h
index 05fedb5f08..29aedb96e4 100644
--- a/src/node_child_process.h
+++ b/src/node_child_process.h
@@ -4,11 +4,12 @@
 
 #include <node.h>
 #include <node_object_wrap.h>
+
 #include <v8.h>
 #include <ev.h>
 
 #ifdef __MINGW32__
-# include <windows.h> // HANDLE type
+# include <platform_win32.h> // HANDLE type
 #endif
 
 // ChildProcess is a thin wrapper around ev_child. It has the extra
diff --git a/src/node_child_process_win32.cc b/src/node_child_process_win32.cc
index 615b0daf38..5f7f2171ed 100644
--- a/src/node_child_process_win32.cc
+++ b/src/node_child_process_win32.cc
@@ -1,16 +1,6 @@
 
-// RegisterWaitForSingleObject requires Windows 2000,
-// GetProcessId requires windows XP SP1
-#define _WIN32_WINNT 0x0501
-
-
 #include <node.h>
 #include <node_child_process.h>
-#include <platform_win32.h>
-#include <platform_win32_winsock.h>
-
-#include <windows.h>
-#include <winsock.h>
 
 #include <v8.h>
 #include <ev.h>
@@ -23,6 +13,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include <platform_win32.h>
+#include <platform_win32_winsock.h>
 
 namespace node {
 
diff --git a/src/node_constants.cc b/src/node_constants.cc
index 2ad6ce78b7..d82bca855f 100644
--- a/src/node_constants.cc
+++ b/src/node_constants.cc
@@ -1,6 +1,8 @@
 // Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
 #include <node_constants.h>
 
+#include <ev.h>
+
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -8,8 +10,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <ev.h>
-
 namespace node {
 
 using namespace v8;
diff --git a/src/node_file.cc b/src/node_file.cc
index 638479a82b..a4527ff688 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -16,7 +16,7 @@
 #include <limits.h>
 
 #ifdef __MINGW32__
-#include <windows.h>
+# include <platform_win32.h>
 #endif
 
 /* used for readlink, AIX doesn't provide it */
diff --git a/src/node_net.cc b/src/node_net.cc
index b711c39692..de45b2f923 100644
--- a/src/node_net.cc
+++ b/src/node_net.cc
@@ -1,9 +1,11 @@
-#include <node_net.h>
-#include <v8.h>
 
 #include <node.h>
 #include <node_buffer.h>
+#include <node_net.h>
 
+#include <v8.h>
+
+#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -12,16 +14,15 @@
 #include <fcntl.h>
 
 #ifdef __MINGW32__
-# include <winsock2.h>
-# include <ws2tcpip.h>
+# include <platform_win32.h>
+# include <platform_win32_winsock.h>
+#endif
 
-#else // __POSIX__
+#ifdef __POSIX__
 # include <sys/ioctl.h>
 # include <sys/socket.h>
 # include <sys/un.h>
-
 # include <arpa/inet.h> /* inet_pton */
-
 # include <netdb.h>
 # include <netinet/in.h>
 # include <netinet/tcp.h>
@@ -30,15 +31,14 @@
 #ifdef __linux__
 # include <linux/sockios.h> /* For the SIOCINQ / FIONREAD ioctl */
 #endif
+
 /* Non-linux platforms like OS X define this ioctl elsewhere */
 #ifndef FIONREAD
-#include <sys/filio.h>
+# include <sys/filio.h>
 #endif
 
-#include <errno.h>
-
 #ifdef __OpenBSD__
-#include <sys/uio.h>
+# include <sys/uio.h>
 #endif
 
 /*
diff --git a/src/node_os.cc b/src/node_os.cc
index 758648835e..1c98b04975 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -1,20 +1,22 @@
-#include <node_os.h>
 
 #include <node.h>
-#include <v8.h>
+#include <node_os.h>
+#include <platform.h>
 
-#include "platform.h"
+#include <v8.h>
 
 #include <errno.h>
 #include <string.h>
 
+#ifdef __MINGW32__
+# include <platform_win32.h>
+# include <platform_win32_winsock.h>
+#endif
+
 #ifdef __POSIX__
 # include <unistd.h>  // gethostname, sysconf
 # include <sys/utsname.h>
-#else // __MINGW32__
-# include <windows.h> // GetVersionEx
-# include <winsock2.h> // gethostname
-#endif // __MINGW32__
+#endif
 
 namespace node {
 
diff --git a/src/node_stdio_win32.cc b/src/node_stdio_win32.cc
index 74aafc8a85..468a110576 100644
--- a/src/node_stdio_win32.cc
+++ b/src/node_stdio_win32.cc
@@ -1,9 +1,13 @@
-#include <io.h>
 #include <node.h>
 #include <node_stdio.h>
-#include <platform_win32.h>
+
 #include <v8.h>
 
+#include <errno.h>
+#include <io.h>
+
+#include <platform_win32.h>
+
 using namespace v8;
 namespace node {
 
diff --git a/src/platform_win32.cc b/src/platform_win32.cc
index 9ceeeeb925..5dd425e356 100644
--- a/src/platform_win32.cc
+++ b/src/platform_win32.cc
@@ -1,15 +1,17 @@
-#include "node.h"
-#include "platform.h"
-#include "platform_win32.h"
+
+#include <node.h>
+#include <platform.h>
 
 #include <v8.h>
 
 #include <errno.h>
+#include <stdlib.h>
 #include <sys/param.h> // for MAXPATHLEN
 #include <unistd.h> // getpagesize
-#include <windows.h>
 
-#include "platform_win32_winsock.cc"
+#include <platform_win32.h>
+
+#include <platform_win32_winsock.cc>
 
 namespace node {
 
diff --git a/src/platform_win32.h b/src/platform_win32.h
index fdaead76da..b40031473e 100644
--- a/src/platform_win32.h
+++ b/src/platform_win32.h
@@ -1,9 +1,41 @@
 #ifndef NODE_PLATFORM_WIN32_H_
 #define NODE_PLATFORM_WIN32_H_
 
-#include <windows.h>
+// Require at least Windows XP SP1
+// (GetProcessId requires it)
+#ifndef _WIN32_WINNT
+# define _WIN32_WINNT 0x0501
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN // implies NOCRYPT and NOGDI.
+#endif
+
+#ifndef NOMINMAX
+# define NOMINMAX
+#endif
+
+#ifndef NOKERNEL
+# define NOKERNEL
+#endif
+
+#ifndef NOUSER
+# define NOUSER
+#endif
 
+#ifndef NOSERVICE
+# define NOSERVICE
+#endif
 
+#ifndef NOSOUND
+# define NOSOUND
+#endif
+
+#ifndef NOMCX
+# define NOMCX
+#endif
+
+#include <windows.h>
 
 namespace node {
 
@@ -14,4 +46,5 @@ void winapi_perror(const char* prefix);
 
 }
 
-#endif  // NODE_PLATFORM_WIN32_H_
+#endif  // NODE_PLATFORM_WIN32_H_
+
diff --git a/src/platform_win32_winsock.cc b/src/platform_win32_winsock.cc
index d6eacff5b7..37c0ed6cf5 100644
--- a/src/platform_win32_winsock.cc
+++ b/src/platform_win32_winsock.cc
@@ -7,14 +7,8 @@
  */
 
 
-#include <windows.h>
-#include <winsock2.h>
-#include <mswsock.h>
-#include <ws2tcpip.h>
-#include <ws2spi.h>
 #include <platform_win32_winsock.h>
 
-
 namespace node {
 
 
diff --git a/src/platform_win32_winsock.h b/src/platform_win32_winsock.h
index a80f612136..7206e5b14e 100644
--- a/src/platform_win32_winsock.h
+++ b/src/platform_win32_winsock.h
@@ -1,11 +1,14 @@
 #ifndef NODE_PLATFORM_WIN32_WINSOCK_H_
 #define NODE_PLATFORM_WIN32_WINSOCK_H_
 
-#include <windows.h>
-#include <winsock.h>
+#include <platform_win32.h>
 
-namespace node {
+#include <winsock2.h>
+#include <mswsock.h>
+#include <ws2tcpip.h>
+#include <ws2spi.h>
 
+namespace node {
 
 void wsa_init();