From: Ozkan Sezer <sezeroz@gmail.com>
Date: Sun, 18 Apr 2010 10:15:52 +0000 (+0000)
Subject: gsocket.h: Make sure that winsock2.h is included before windows.h.
X-Git-Tag: releases/gcc-4.6.0~7800
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d29aedcb87015fc3281e644cebde452d8b41007;p=thirdparty%2Fgcc.git

gsocket.h: Make sure that winsock2.h is included before windows.h.

2010-04-18  Ozkan Sezer  <sezeroz@gmail.com>

        * gsocket.h: Make sure that winsock2.h is included before windows.h.

From-SVN: r158482
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d24a07d4dc3f..ee70230c08e7 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-18  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* gsocket.h: Make sure that winsock2.h is included before windows.h.
+
 2010-04-17  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/utils2.c (build_unary_op) <ATTR_ADDR_EXPR>: Do not
diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
index ca016c921c0a..a8e6faa24672 100644
--- a/gcc/ada/gsocket.h
+++ b/gcc/ada/gsocket.h
@@ -71,7 +71,6 @@
 
 #elif defined (WINNT)
 #define FD_SETSIZE 1024
-#include <windows.h>
 
 #ifdef __MINGW32__
 #include <winsock2.h>
@@ -160,6 +159,8 @@
 
 #endif
 
+#include <windows.h>
+
 #elif defined(VMS)
 #define FD_SETSIZE 4096
 #ifndef IN_RTS