From 2db2926571bac568e1de4899b7900c64daabc38a Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Sat, 23 Oct 2010 18:18:22 +0000
Subject: [PATCH] reorder #includes to fix redefinition problem in mingw64 if
 winsock2.h isn't included before windows.h, different conflicting definitions
 are used for several macros and typedefs

git-svn-id: svn://localhost/HandBrake/trunk@3613 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 libhb/ports.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/libhb/ports.c b/libhb/ports.c
index 7e5421da..dbfcb66b 100644
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -27,6 +27,16 @@
 #include <machine/cpu.h>
 #endif
 
+#ifdef SYS_MINGW
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#endif
+
 #ifdef SYS_CYGWIN
 #include <windows.h>
 #endif
@@ -43,17 +53,6 @@
 #include <time.h>
 #include <sys/time.h>
 
-
-#ifdef SYS_MINGW
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-
 #if defined( SYS_LINUX )
 #include <linux/cdrom.h>
 #include <fcntl.h>
-- 
2.11.0