From a892a876d60ec67da321e48e31dc80b95fd6d9aa Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 9 Aug 2010 17:35:36 +0000
Subject: [PATCH] improved include order to fix some compile errors using mingw
 g++

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10384 d7cf8633-e32d-0410-b094-e92efae38249
---
 common.c  | 4 ++--
 console.c | 4 ++--
 fs.c      | 4 ++--
 snd_win.c | 6 ++++--
 sys_win.c | 7 +++++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/common.c b/common.c
index b94f0973..9bcaeb8c 100644
--- a/common.c
+++ b/common.c
@@ -19,14 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // common.c -- misc functions used in client and server
 
-#include "quakedef.h"
-
 #include <stdlib.h>
 #include <fcntl.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
 
+#include "quakedef.h"
+
 cvar_t registered = {0, "registered","0", "indicates if this is running registered quake (whether gfx/pop.lmp was found)"};
 cvar_t cmdline = {0, "cmdline","0", "contains commandline the engine was launched with"};
 
diff --git a/console.c b/console.c
index e23de5bb..3ce37373 100644
--- a/console.c
+++ b/console.c
@@ -19,13 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // console.c
 
-#include "quakedef.h"
-
 #if !defined(WIN32) || defined(__MINGW32__)
 # include <unistd.h>
 #endif
 #include <time.h>
 
+#include "quakedef.h"
+
 // for u8_encodech
 #include "ft2.h"
 
diff --git a/fs.c b/fs.c
index e7a5f536..8086a34b 100644
--- a/fs.c
+++ b/fs.c
@@ -22,8 +22,6 @@
 		Boston, MA  02111-1307, USA
 */
 
-#include "quakedef.h"
-
 #include <limits.h>
 #include <fcntl.h>
 
@@ -37,6 +35,8 @@
 # include <unistd.h>
 #endif
 
+#include "quakedef.h"
+
 #include "fs.h"
 #include "wad.h"
 
diff --git a/snd_win.c b/snd_win.c
index a7a2adff..08012248 100644
--- a/snd_win.c
+++ b/snd_win.c
@@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "quakedef.h"
-#include "snd_main.h"
 
 #ifdef SUPPORTDIRECTX
 #ifndef DIRECTSOUND_VERSION
@@ -31,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <dsound.h>
 #endif
 
+#include "qtypes.h"
+#include "quakedef.h"
+#include "snd_main.h"
+
 // ==============================================================================
 
 #ifndef _WAVEFORMATEXTENSIBLE_
diff --git a/sys_win.c b/sys_win.c
index 4adaf692..3b48f18d 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -19,16 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sys_win.c -- Win32 system interface code
 
-#include "quakedef.h"
 #include <windows.h>
 #include <mmsystem.h>
+#include <direct.h>
 #ifdef SUPPORTDIRECTX
 #include <dsound.h>
 #endif
+
+#include "qtypes.h"
+
+#include "quakedef.h"
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
-#include "direct.h"
 
 HANDLE				hinput, houtput;
 
-- 
2.39.2