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.
This commit is contained in:
@ -568,7 +568,7 @@ fhandler_base::write (const void *ptr, size_t len)
|
||||
|
||||
if (get_append_p ())
|
||||
SetFilePointer (get_handle(), 0, 0, FILE_END);
|
||||
else if (os_being_run != winNT && get_check_win95_lseek_bug ())
|
||||
else if (!iswinnt && get_check_win95_lseek_bug ())
|
||||
{
|
||||
/* Note: this bug doesn't happen on NT4, even though the documentation
|
||||
for WriteFile() says that it *may* happen on any OS. */
|
||||
@ -1417,7 +1417,7 @@ fhandler_disk_file::lock (int cmd, struct flock *fl)
|
||||
|
||||
BOOL res;
|
||||
|
||||
if (os_being_run == winNT)
|
||||
if (iswinnt)
|
||||
{
|
||||
DWORD lock_flags = (cmd == F_SETLK) ? LOCKFILE_FAIL_IMMEDIATELY : 0;
|
||||
lock_flags |= (fl->l_type == F_WRLCK) ? LOCKFILE_EXCLUSIVE_LOCK : 0;
|
||||
|
Reference in New Issue
Block a user