Alexandre Julliard : sane.ds: Include system headers before Windows headers .

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Sep  5 17:22:50 2011 +0200

sane.ds: Include system headers before Windows headers.

---

 dlls/sane.ds/capability.c |    3 ---
 dlls/sane.ds/ds_ctrl.c    |    1 -
 dlls/sane.ds/ds_image.c   |    5 +----
 dlls/sane.ds/options.c    |    1 -
 dlls/sane.ds/sane_i.h     |   16 +++++++++-------
 dlls/sane.ds/sane_main.c  |    3 ---
 dlls/sane.ds/ui.c         |    5 +----
 7 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c
index 20fd2c3..1381220 100644
--- a/dlls/sane.ds/capability.c
+++ b/dlls/sane.ds/capability.c
@@ -25,9 +25,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
 #include "sane_i.h"
 #include "winnls.h"
 #include "wine/debug.h"
diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c
index 9901fff..713f311 100644
--- a/dlls/sane.ds/ds_ctrl.c
+++ b/dlls/sane.ds/ds_ctrl.c
@@ -22,7 +22,6 @@
 # include <unistd.h>
 #endif
 #include <stdlib.h>
-#include "twain.h"
 #include "sane_i.h"
 #include "wine/debug.h"
 
diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c
index 4945e55..77826b0 100644
--- a/dlls/sane.ds/ds_image.c
+++ b/dlls/sane.ds/ds_image.c
@@ -21,12 +21,9 @@
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
+#include "sane_i.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "twain.h"
-#include "sane_i.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(twain);
diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c
index 67cb1dc..7b792b2 100644
--- a/dlls/sane.ds/options.c
+++ b/dlls/sane.ds/options.c
@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include "twain.h"
 #include "sane_i.h"
 #include "wine/debug.h"
 
diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h
index 17826d2..ae58159 100644
--- a/dlls/sane.ds/sane_i.h
+++ b/dlls/sane.ds/sane_i.h
@@ -23,10 +23,19 @@
 # error You must include config.h first
 #endif
 
+#include <stdarg.h>
+
 #ifdef SONAME_LIBSANE
 # include <sane/sane.h>
 # include <sane/saneopts.h>
+#endif
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "twain.h"
 
+#ifdef SONAME_LIBSANE
 #define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN;
 MAKE_FUNCPTR(sane_init)
 MAKE_FUNCPTR(sane_exit)
@@ -43,14 +52,7 @@ MAKE_FUNCPTR(sane_set_io_mode)
 MAKE_FUNCPTR(sane_get_select_fd)
 MAKE_FUNCPTR(sane_strstatus)
 #undef MAKE_FUNCPTR
-
 #endif
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "twain.h"
 
 extern HINSTANCE SANE_instance DECLSPEC_HIDDEN;
 
diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c
index f482098..1c73252 100644
--- a/dlls/sane.ds/sane_main.c
+++ b/dlls/sane.ds/sane_main.c
@@ -24,9 +24,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "twain.h"
 #include "sane_i.h"
 #include "wine/debug.h"
 #include "wine/library.h"
diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c
index 147c759..5d4cd83 100644
--- a/dlls/sane.ds/ui.c
+++ b/dlls/sane.ds/ui.c
@@ -26,14 +26,11 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
+#include "sane_i.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "wingdi.h"
 #include "prsht.h"
-#include "twain.h"
-#include "sane_i.h"
 #include "wine/debug.h"
 #include "resource.h"
 #include "wine/unicode.h"