diff options
author | Christopher Faylor <me@cgf.cx> | 2005-04-29 03:59:44 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-04-29 03:59:44 +0400 |
commit | c4ffa3c427f77224e8a2d58219c9de25666b0b69 (patch) | |
tree | 628c949a7dca65aea4684a1a97207f47cf9bdbd5 /winsup/cygwin/shared_info.h | |
parent | e525f6d51a38d6648ebba2a2c2b25f31d7bfe5ce (diff) |
* shared_info.h (cygwin_shared_address): Bump to a higher value to avoid
collision with large data areas.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Accommodate changes to
open_shared arguments.
* fhandler_tape.cc (mtinfo_init): Ditto.
* pinfo.cc (pinfo::init): Use open_shared rather than win32 mmap calls.
* shared.cc (user_shared_initialize): Ditto.
(memory_init): Ditto.
(open_shared): Change to allow use a smore general mmap handler.
* shared_info.h (shared_locations): Add SH_JUSTCREATE, SH_JUSTOPEN.
(open_shared): Change declaration to match new usage.
* autoload.cc (LoadDLLfuncEx2): Define in terms of LoadDLLfuncEx3.
(LoadDLLfuncEx3): New macro.
Diffstat (limited to 'winsup/cygwin/shared_info.h')
-rw-r--r-- | winsup/cygwin/shared_info.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h index 5fa00f3dd..cfe222a72 100644 --- a/winsup/cygwin/shared_info.h +++ b/winsup/cygwin/shared_info.h @@ -173,7 +173,10 @@ enum shared_locations SH_SHARED_CONSOLE, SH_MYSELF, SH_MTINFO, - SH_TOTAL_SIZE + SH_TOTAL_SIZE, + SH_JUSTCREATE, + SH_JUSTOPEN + }; void __stdcall memory_init (); @@ -182,7 +185,7 @@ void __stdcall memory_init (); (((DWORD) ((p) + 1) + system_info.dwAllocationGranularity - 1) / \ system_info.dwAllocationGranularity))) -#define cygwin_shared_address ((void *) 0xa000000) +#define cygwin_shared_address ((void *) 0x60000000) #ifdef _FHANDLER_H_ struct console_state @@ -194,6 +197,7 @@ struct console_state char *__stdcall shared_name (char *, const char *, int); void *__stdcall open_shared (const char *name, int n, HANDLE &shared_h, DWORD size, - shared_locations, PSECURITY_ATTRIBUTES psa = &sec_all); + shared_locations&, PSECURITY_ATTRIBUTES psa = &sec_all, + DWORD access = FILE_MAP_READ | FILE_MAP_WRITE); extern void user_shared_initialize (bool reinit); |