From 70fab4ec71b3a206b042b6c027c14ad575876b8c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 18 Apr 2008 20:30:04 +0000 Subject: Revert thinko in previous patch. * fhandler.h (struct wsa_event): Move back from wsa_event.h to here. * fhandler_socket.cc (NUM_SOCKS): Ditto. (wsa_events): Move back from cygwin_shared to here. Accommodate throughout. (socket_serial_number): Ditto. * shared_info.h: Accommodate above changes. * wsa_event.h: Remove. --- winsup/cygwin/shared_info.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'winsup/cygwin/shared_info.h') diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h index bb4982b6e..ea504d2e3 100644 --- a/winsup/cygwin/shared_info.h +++ b/winsup/cygwin/shared_info.h @@ -10,7 +10,6 @@ details. */ #include "tty.h" #include "security.h" -#include "wsa_event.h" #include "mtinfo.h" /* Mount table entry */ @@ -123,9 +122,9 @@ public: cygwin_version.api_minor) #define SHARED_VERSION_MAGIC CYGWIN_VERSION_MAGIC (SHARED_MAGIC, SHARED_VERSION) -#define SHARED_INFO_CB 63912 +#define SHARED_INFO_CB 31144 -#define CURR_SHARED_MAGIC 0x419c874U +#define CURR_SHARED_MAGIC 0xbc77afb0U /* NOTE: Do not make gratuitous changes to the names or organization of the below class. The layout is checksummed to determine compatibility between @@ -140,8 +139,6 @@ class shared_info unsigned heap_slop; DWORD sys_mount_table_counter; tty_list tty; - wsa_event wsa_events[NUM_SOCKS]; - LONG socket_serial_number; LONG last_used_bindresvport; mtinfo mt; -- cgit v1.2.3