From f2e6c508699f87c2bf8bbf65efe645e45120c8e9 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 5 Apr 2006 16:53:12 +0000
Subject: [PATCH] * fhandler_socket.cc: Move iptypes.h include after winsock2
 since it now relies on it. * net.cc: Ditto.

---
 winsup/cygwin/ChangeLog          | 6 ++++++
 winsup/cygwin/fhandler_socket.cc | 2 +-
 winsup/cygwin/net.cc             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 07bde3bd7..eaf3135e5 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-05  Christopher Faylor  <cgf@timesys.com>
+
+	* fhandler_socket.cc: Move iptypes.h include after winsock2 since it
+	now relies on it.
+	* net.cc: Ditto.
+
 2006-04-05  Christopher Faylor  <cgf@timesys.com>
 
 	* dcrt0.cc (dll_crt0_0): Move user_data->{resourcelocks,threadinterface}
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 7d666620f..01e9870b6 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -17,11 +17,11 @@
 #include <sys/un.h>
 #include <sys/uio.h>
 #include <asm/byteorder.h>
-#include <iphlpapi.h>
 
 #include <stdlib.h>
 #define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
+#include <iphlpapi.h>
 #include "cygerrno.h"
 #include "security.h"
 #include "cygwin/version.h"
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index baf0c0c95..edc554a68 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -17,7 +17,6 @@ details. */
 #include <ctype.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <iphlpapi.h>
 #include <syslog.h>
 
 #include <stdlib.h>
@@ -27,6 +26,7 @@ details. */
 #include <netdb.h>
 #define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
+#include <iphlpapi.h>
 #include <assert.h>
 #include "cygerrno.h"
 #include "security.h"