From: Peter Ekberg <peda@lysator.liu.se>
Date: Tue, 2 Aug 2005 06:20:43 +0000 (+0000)
Subject: * libltdl/ltdl.c (sys_wll_open): Revert commit mistake.
X-Git-Tag: release-1-5-20~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b71a958a24101bbc91110e0cf6ae4b866831882;p=thirdparty%2Flibtool.git

* libltdl/ltdl.c (sys_wll_open): Revert commit mistake.
---

diff --git a/ChangeLog b/ChangeLog
index 110782085..e61309b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-02  Peter Ekberg  <peda@lysator.liu.se>
 
+	* libltdl/ltdl.c (sys_wll_open): Revert commit mistake.
+
 	* ltmain.in (link mode) <lib>: Make sure skipped_export is
 	set to colon if _some_ cmd of export_symbols_cmds is too long.
 
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 378b3e02d..4b99e742c 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1348,26 +1348,15 @@ sys_wll_open (loader_data, filename)
   if (!searchname)
     return 0;
 
-  {
-    /* Silence dialog from LoadLibrary on some failures.
-       No way to get the error mode, but to set it,
-       so set it twice to preserve any previous flags. */
-    UINT errormode = SetErrorMode (SEM_FAILCRITICALERRORS);
-    SetErrorMode (errormode | SEM_FAILCRITICALERRORS);
-
 #if __CYGWIN__
-    {
-      char wpath[MAX_PATH];
-      cygwin_conv_to_full_win32_path (searchname, wpath);
-      module = LoadLibrary (wpath);
-    }
+  {
+    char wpath[MAX_PATH];
+    cygwin_conv_to_full_win32_path(searchname, wpath);
+    module = LoadLibrary(wpath);
+  }
 #else
-    module = LoadLibrary (searchname);
+  module = LoadLibrary (searchname);
 #endif
-
-    /* Restore the error mode. */
-    SetErrorMode (errormode);
-  }
   LT_DLFREE (searchname);
 
   /* libltdl expects this function to fail if it is unable