Alexandre Julliard : mountmgr.sys: Include system headers before Windows headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2fff57a5e7f501dbb736b4edb7903324dabccfcf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fff57a5e7f501dbb736b4edb7...

Author: Alexandre Julliard 
Date:   Tue Sep  6 12:11:41 2011 +0200

mountmgr.sys: Include system headers before Windows headers.

---

dlls/mountmgr.sys/diskarb.c |    5 +++--
 dlls/mountmgr.sys/hal.c     |    7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c
index d3912ca..9a7616e 100644
--- a/dlls/mountmgr.sys/diskarb.c
+++ b/dlls/mountmgr.sys/diskarb.c
@@ -26,6 +26,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/time.h>
+#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
+#include <DiskArbitration/DiskArbitration.h>
+#endif

#include "mountmgr.h"
 #include "wine/debug.h"
@@ -34,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);

#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H

-#include <DiskArbitration/DiskArbitration.h>
-
 static void appeared_callback( DADiskRef disk, void *context )
 {
     CFDictionaryRef dict = DADiskCopyDescription( disk );
diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c
index 82a70e9..d369879 100644
--- a/dlls/mountmgr.sys/hal.c
+++ b/dlls/mountmgr.sys/hal.c
@@ -26,6 +26,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/time.h>
+#ifdef SONAME_LIBHAL
+# include <dbus/dbus.h>
+# include <hal/libhal.h>
+#endif

#include "mountmgr.h"
 #include "winnls.h"
@@ -39,9 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);

#ifdef SONAME_LIBHAL

-#include <dbus/dbus.h>
-#include <hal/libhal.h>
-
 #define DBUS_FUNCS \
     DO_FUNC(dbus_bus_get); \
     DO_FUNC(dbus_connection_close); \