diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-02-23 13:51:59 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-02-23 13:51:59 +0300 |
| commit | aaee2ffaed818ccaf248b4097a3b7c7bfa4ea82a (patch) | |
| tree | de45285730967b7e6bad23073b76ae2506c3e453 /winsup/cygwin/shared.cc | |
| parent | 0ed760d75e34775d5de25ac52cbcc5b5dd18ed15 (diff) | |
* exceptions.cc (dummy_ctrl_c_handler): Remove.
(init_console_handler): Drop has_null_console_handler_routine checks.
* fhandler_raw.cc (fhandler_dev_raw::open): Drop has_raw_devices check.
* fhandler_serial.cc (fhandler_serial::open): Drop
.supports_reading_modem_output_lines check.
* miscfuncs.cc (low_priority_sleep): Drop has_switch_to_thread check.
* shared.cc (open_shared): Drop needs_memory_protection checks.
* spawn.cc (spawn_guts): Drop start_proc_suspended check.
* uname.cc (uname): Drop has_valid_processorlevel check.
* wincap.cc: Remove has_raw_devices, has_valid_processorlevel,
supports_reading_modem_output_lines, needs_memory_protection,
has_switch_to_thread, start_proc_suspended and
has_null_console_handler_routine throughout.
* wincap.h: Ditto.
Diffstat (limited to 'winsup/cygwin/shared.cc')
| -rw-r--r-- | winsup/cygwin/shared.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 705cc16f9..a60d361fb 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -69,8 +69,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size, void *shared; void *addr; - if ((m == SH_JUSTCREATE || m == SH_JUSTOPEN) - || !wincap.needs_memory_protection () && offsets[0]) + if (m == SH_JUSTCREATE || m == SH_JUSTOPEN) addr = NULL; else { @@ -122,7 +121,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] && wincap.needs_memory_protection ()) + if (m == SH_USER_SHARED && offsets[0]) { ptrdiff_t delta = (caddr_t) shared - (caddr_t) off_addr (0); offsets[0] = (caddr_t) shared - (caddr_t) cygwin_hmodule; |