From 7075440208ba88e3b7ac51daf4aa442cacbf2429 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 23 May 2008 11:59:37 +0000 Subject: [PATCH] * shared.cc (open_shared): Fix comments. Fix a condition which has been overlooked to revert to its old state in change from 2008-04-18. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/shared.cc | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 36727de69..50d94cc97 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-05-22 Corinna Vinschen + + * shared.cc (open_shared): Fix comments. Fix a condition which has + been overlooked to revert to its old state in change from 2008-04-18. + 2008-05-22 Corinna Vinschen * path.cc (symlink_info::check): Define eabuf and easize outside of diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 760c33288..b2a1b68a5 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -165,12 +165,11 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size, if (!shared && addr) { - /* Probably win95, so try without specifying the address. */ shared = (shared_info *) MapViewOfFileEx (shared_h, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 0, NULL); #ifdef DEBUGGING - system_printf ("relocating shared object %s(%d) from %p to %p on Windows NT", name, n, addr, shared); + system_printf ("relocating shared object %s(%d) from %p to %p", name, n, addr, shared); #endif offsets[0] = 0; } @@ -178,7 +177,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size, if (!shared) api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", mapname, shared_h); - if (m == SH_USER_SHARED && offsets[0]) + if (m == SH_CYGWIN_SHARED && offsets[0]) { ptrdiff_t delta = (caddr_t) shared - (caddr_t) off_addr (0); offsets[0] = (caddr_t) shared - (caddr_t) cygwin_hmodule; -- 2.43.5