* 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.
This commit is contained in:
parent
1870c68806
commit
7075440208
|
@ -1,3 +1,8 @@
|
||||||
|
2008-05-22 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* 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 <corinna@vinschen.de>
|
2008-05-22 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* path.cc (symlink_info::check): Define eabuf and easize outside of
|
* path.cc (symlink_info::check): Define eabuf and easize outside of
|
||||||
|
|
|
@ -165,12 +165,11 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
|
||||||
|
|
||||||
if (!shared && addr)
|
if (!shared && addr)
|
||||||
{
|
{
|
||||||
/* Probably win95, so try without specifying the address. */
|
|
||||||
shared = (shared_info *) MapViewOfFileEx (shared_h,
|
shared = (shared_info *) MapViewOfFileEx (shared_h,
|
||||||
FILE_MAP_READ|FILE_MAP_WRITE,
|
FILE_MAP_READ|FILE_MAP_WRITE,
|
||||||
0, 0, 0, NULL);
|
0, 0, 0, NULL);
|
||||||
#ifdef DEBUGGING
|
#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
|
#endif
|
||||||
offsets[0] = 0;
|
offsets[0] = 0;
|
||||||
}
|
}
|
||||||
|
@ -178,7 +177,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
|
||||||
if (!shared)
|
if (!shared)
|
||||||
api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", mapname, shared_h);
|
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);
|
ptrdiff_t delta = (caddr_t) shared - (caddr_t) off_addr (0);
|
||||||
offsets[0] = (caddr_t) shared - (caddr_t) cygwin_hmodule;
|
offsets[0] = (caddr_t) shared - (caddr_t) cygwin_hmodule;
|
||||||
|
|
Loading…
Reference in New Issue