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 e171c4fcf..cc702cc6c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2011-03-01 Christopher Faylor <me+cygwin@cgf.cx> + * autoload.cc (dll_load): Avoid in_forkee test since this apparently + fails even when not forked. + +2011-03-01 Christopher Faylor <me+cygwin@cgf.cx> + * include/cygwin/version.h: Bump CYGWIN_VERSION_DLL_MINOR to 9. 2011-02-28 Christopher Faylor <me+cygwin@cgf.cx> diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index 8b20fea2b..f959edd6b 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -216,8 +216,8 @@ static __inline bool dll_load (HANDLE& handle, WCHAR *name) { HANDLE h = LoadLibraryW (name); - if (!h && in_forkee && handle && GetLastError () == ERROR_INVALID_ADDRESS - && wincap.use_dont_resolve_hack ()) + if (!h && handle && wincap.use_dont_resolve_hack () + && GetLastError () == ERROR_INVALID_ADDRESS) h = LoadLibraryExW (name, NULL, DONT_RESOLVE_DLL_REFERENCES); if (!h) return false; |