JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix condition in DLL loading loop

Browse Source
This commit is contained in:
Corinna Vinschen 2015-03-11 12:22:45 +01:00
parent 58c9102ea2
commit f085e9d321
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -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> 2015-03-10 Yaakov Selkowitz <yselkowitz@cygwin.com>
* include/stdint.h: Fix __x86_64__ conditional. * include/stdint.h: Fix __x86_64__ conditional.

4
winsup/cygwin/autoload.cc
View File

@ -1,7 +1,7 @@
/* autoload.cc: all dynamic load stuff. /* autoload.cc: all dynamic load stuff.
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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. This file is part of Cygwin.
@ -429,7 +429,7 @@ std_dll_init ()
for (i = 1; i <= RETRY_COUNT; i++) for (i = 1; i <= RETRY_COUNT; i++)
{ {
/* If loading the library succeeds, just leave the loop. */ /* If loading the library succeeds, just leave the loop. */
if (!dll_load (dll->handle, dll_path)) if (dll_load (dll->handle, dll_path))
break; break;
/* Otherwise check error code returned by LoadLibrary. If the /* Otherwise check error code returned by LoadLibrary. If the
error code is neither NOACCESS nor DLL_INIT_FAILED, break out error code is neither NOACCESS nor DLL_INIT_FAILED, break out