diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/autoload.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index cd2dbb92f..56af2b899 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2015-03-11 Corinna Vinschen <corinna@vinschen.de> + + * autoload.cc (std_dll_init): Fix condition for breaking from DLL + loading loop. + 2015-03-10 Yaakov Selkowitz <yselkowitz@cygwin.com> * include/stdint.h: Fix __x86_64__ conditional. diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index a4812a678..fd25e1780 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -1,7 +1,7 @@ /* autoload.cc: all dynamic load stuff. Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011, 2012, 2013, 2014 Red Hat, Inc. + 2011, 2012, 2013, 2014, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -429,7 +429,7 @@ std_dll_init () for (i = 1; i <= RETRY_COUNT; i++) { /* If loading the library succeeds, just leave the loop. */ - if (!dll_load (dll->handle, dll_path)) + if (dll_load (dll->handle, dll_path)) break; /* Otherwise check error code returned by LoadLibrary. If the error code is neither NOACCESS nor DLL_INIT_FAILED, break out |