From 1d80d6514b921c9d1debf5fc7d36bdd3ec8ebc2d Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Thu, 10 Sep 2009 14:39:39 +0000
Subject: [PATCH] Juggle include order in agi_pre.h around a bit to make things
 work properly on Windows.

Originally committed to SVN as r3517.
---
 aegisub/src/agi_pre.h | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 4e316907b..ef70361d2 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -49,7 +49,6 @@
 
 /////////
 // Setup
-#define WIN32_LEAN_AND_MEAN
 #define AGI_PRE
 
 // Block msvc from complaining about not using msvc-specific versions for
@@ -86,32 +85,29 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/stat.h>
 #include <time.h>
-#include <unistd.h>
 #include <wchar.h>
 
-#ifdef __WINDOWS__
-#include <Mmreg.h>
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include <process.h>
-#include <mmsystem.h>
-#include <objbase.h>
+//#include <objbase.h>
 #include <shlobj.h>
 #include <tchar.h>
 #include <vfw.h>
-#include <windef.h>
-#include <windows.h>
+//#include <windef.h>
 
 #else
 
 #include <sys/fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <unistd.h>
 #endif
 
 /////////////////////