diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/net.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fd297a08f..f28587d7b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Thu May 3 18:16:00 2001 Corinna Vinschen <corinna@vinschen.de> + + * net.cc (wsock_init): Rename `was_in_progress' to `wsock_started' + for clearness. + Thu May 3 10:44:16 2001 Christopher Faylor <cgf@cygnus.com> * exceptions.cc (handle_exceptions): Break out of "loop" if the diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 72c7010d8..56848877b 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -1929,14 +1929,14 @@ extern "C" void wsock_init () { static LONG NO_COPY here = -1L; - static int NO_COPY was_in_progress = 0; + static int NO_COPY wsock_started = 0; while (InterlockedIncrement (&here)) { InterlockedDecrement (&here); Sleep (0); } - if (!was_in_progress && (wsock32_handle || ws2_32_handle)) + if (!wsock_started && (wsock32_handle || ws2_32_handle)) { /* Don't use autoload to load WSAStartup to eliminate recursion. */ int (*wsastartup) (int, WSADATA *); @@ -1957,7 +1957,7 @@ wsock_init () debug_printf ("iMaxUdpDg %d", wsadata.iMaxUdpDg); debug_printf ("lpVendorInfo %d", wsadata.lpVendorInfo); - was_in_progress = 1; + wsock_started = 1; } } InterlockedDecrement (&here); |