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/net.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/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 4e93a9e11..f9c6853a6 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -122,7 +122,7 @@ WSADATA wsadata; static SOCKET __stdcall set_socket_inheritance (SOCKET sock) { - if (os_being_run == winNT) + if (iswinnt) (void) SetHandleInformation ((HANDLE) sock, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT); else { @@ -1292,9 +1292,9 @@ getdomainname (char *domain, int len) * Punt for now and assume MS-TCP on Win95. */ reg_key r (HKEY_LOCAL_MACHINE, KEY_READ, - (os_being_run != winNT) ? "System" : "SYSTEM", + (!iswinnt) ? "System" : "SYSTEM", "CurrentControlSet", "Services", - (os_being_run != winNT) ? "MSTCP" : "Tcpip", + (!iswinnt) ? "MSTCP" : "Tcpip", NULL); /* FIXME: Are registry keys case sensitive? */ |