From ab908b3c456ca9aa91e341c93d27edde8edf0aef Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Fri, 11 Feb 2005 22:43:32 +0000
Subject: [PATCH] Include winsock2.h before windows.h, to avoid compilation
 errors with

2005-02-11  Tor Lillqvist  <tml@novell.com>

	* glib/giowin32.c: Include winsock2.h before windows.h, to avoid
	compilation errors with MSVC. (#167105)
---
 ChangeLog          | 5 +++++
 ChangeLog.pre-2-10 | 5 +++++
 ChangeLog.pre-2-12 | 5 +++++
 ChangeLog.pre-2-8  | 5 +++++
 glib/giowin32.c    | 2 +-
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 37c8d9a0..2a83db5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-11  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c: Include winsock2.h before windows.h, to avoid
+	compilation errors with MSVC. (#167105)
+
 2005-02-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_help): Take main group options into
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 37c8d9a0..2a83db5a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-02-11  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c: Include winsock2.h before windows.h, to avoid
+	compilation errors with MSVC. (#167105)
+
 2005-02-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_help): Take main group options into
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 37c8d9a0..2a83db5a 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-02-11  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c: Include winsock2.h before windows.h, to avoid
+	compilation errors with MSVC. (#167105)
+
 2005-02-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_help): Take main group options into
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 37c8d9a0..2a83db5a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-02-11  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c: Include winsock2.h before windows.h, to avoid
+	compilation errors with MSVC. (#167105)
+
 2005-02-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_help): Take main group options into
diff --git a/glib/giowin32.c b/glib/giowin32.c
index 7c986825..43f0b1e9 100644
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -38,8 +38,8 @@
 #include "glib.h"
 
 #include <stdlib.h>
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #include <fcntl.h>
 #include <io.h>
 #include <process.h>
-- 
2.34.1