From 3f6c6dbbb3d44fe72388b03bd49a0daad6463f9c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 16 May 2014 11:34:37 +0200
Subject: [PATCH] sane.ds: Remove unnecessary DllMain implementation when SANE
 is missing.

---
 dlls/sane.ds/sane_main.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c
index c01baeb10d6..7484ca5fc44 100644
--- a/dlls/sane.ds/sane_main.c
+++ b/dlls/sane.ds/sane_main.c
@@ -30,10 +30,10 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(twain);
 
-HINSTANCE SANE_instance;
-
 #ifdef SONAME_LIBSANE
 
+HINSTANCE SANE_instance;
+
 static void *libsane_handle;
 
 static void close_libsane(void *h)
@@ -79,8 +79,6 @@ static void *open_libsane(void)
     return h;
 }
 
-#endif /* SONAME_LIBSANE */
-
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
@@ -88,7 +86,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH: {
-#ifdef SONAME_LIBSANE
 	    SANE_Int version_code;
 
             libsane_handle = open_libsane();
@@ -96,28 +93,25 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
                 return FALSE;
 
 	    psane_init (&version_code, NULL);
-#endif
 	    SANE_instance = hinstDLL;
             DisableThreadLibraryCalls(hinstDLL);
             break;
 	}
         case DLL_PROCESS_DETACH:
             if (lpvReserved) break;
-#ifdef SONAME_LIBSANE
             TRACE("calling sane_exit()\n");
 	    psane_exit ();
             close_libsane(libsane_handle);
-#endif
             break;
     }
 
     return TRUE;
 }
 
-#ifdef SONAME_LIBSANE
 static TW_UINT16 SANE_GetIdentity( pTW_IDENTITY, pTW_IDENTITY);
 static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY);
-#endif
+
+#endif /* SONAME_LIBSANE */
 
 static TW_UINT16 SANE_SourceControlHandler (
            pTW_IDENTITY pOrigin,
-- 
2.11.4.GIT