summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/gsocket.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d24a07d4dc3..ee70230c08e 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 ca016c921c0..a8e6faa2467 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