diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-08-04 21:10:52 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-08-04 21:10:52 +0000 |
| commit | e5ba4c060e410f92abe570933fe2bda239f34bd9 (patch) | |
| tree | f00aba6a99486b9642573415d571c73ab3a0b80b /winsup/cygwin/dcrt0.cc | |
| parent | 17195d08bc7b8e4b9b4bbc21be92497c64f7045c (diff) | |
| download | cygnal-e5ba4c060e410f92abe570933fe2bda239f34bd9.tar.gz cygnal-e5ba4c060e410f92abe570933fe2bda239f34bd9.tar.bz2 cygnal-e5ba4c060e410f92abe570933fe2bda239f34bd9.zip | |
Throughout, change check for running under Windows NT to 'iswinnt'.
* dcrt0.cc (set_os_type): Set 'iswinnt' appropriately.
* cygheap.cc (init_cheap): Revert to using VirtualAlloc for allocating cygheap.
(cygheap_setup_for_child_cleanup): New function. Standard function to call
after calling CreateProcess to cleanup cygheap info passed to child.
(cygheap_fixup_in_child): Copy cygheap from shared memory into allocated space
under Windows 9x or if can't relocate shared space under NT.
* cygheap.h: Declare new function.
* spawn.cc (spawn_guts): Use cygheap_fixup_in_child.
* fork.cc (fork_parent): Ditto.
* winsup.h: Declare iswinnt.
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 2f2e385e3..3a7417cae 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -156,6 +156,7 @@ do_global_ctors (void (**in_pfunc)(), int force) /* remember the type of Win32 OS being run for future use. */ os_type NO_COPY os_being_run; char NO_COPY osname[40]; +bool iswinnt; /* set_os_type: Set global variable os_being_run with type of Win32 operating system being run. This information is used internally @@ -171,11 +172,13 @@ set_os_type () os_version_info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); GetVersionEx (&os_version_info); + iswinnt = 0; switch (os_version_info.dwPlatformId) { case VER_PLATFORM_WIN32_NT: os_being_run = winNT; os = "NT"; + iswinnt = 1; break; case VER_PLATFORM_WIN32_WINDOWS: if (os_version_info.dwMinorVersion == 0) @@ -539,7 +542,7 @@ static NO_COPY STARTUPINFO si; child_info_fork NO_COPY *child_proc_info = NULL; static MEMORY_BASIC_INFORMATION sm; -#define CYGWIN_GUARD ((os_being_run == winNT) ? PAGE_GUARD : PAGE_NOACCESS) +#define CYGWIN_GUARD ((iswinnt) ? PAGE_GUARD : PAGE_NOACCESS) // __inline__ void extern void |