commit 2fff57a5e7f501dbb736b4edb7903324dabccfcf
author Alexandre Julliard <julliard@winehq.org> Tue Sep 06 12:11:41 2011 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 06 13:25:35 2011 +0200
tree 0eeb4186a880ba0ec04d71c057639cab40a05a9c
parent 54c2f6491dbe1493bebc2bb00053998d413a7cf3

mountmgr.sys: Include system headers before Windows headers.

dlls/mountmgr.sys/diskarb.c

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 @@
 
 #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
 
-#include <DiskArbitration/DiskArbitration.h>
-
 static void appeared_callback( DADiskRef disk, void *context )
 {
     CFDictionaryRef dict = DADiskCopyDescription( disk );

dlls/mountmgr.sys/hal.c

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 @@
 
 #ifdef SONAME_LIBHAL
 
-#include <dbus/dbus.h>
-#include <hal/libhal.h>
-
 #define DBUS_FUNCS \
     DO_FUNC(dbus_bus_get); \
     DO_FUNC(dbus_connection_close); \