* 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.
This commit is contained in:
@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user