ChangeLogTag: Tue May 23 20:13:52 2000 Irfan Pyarali <irfan@cs.wustl.edu>

4 files changed, 62 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index dabe607d26d..d07e5aa810c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 23 20:13:52 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/WFMO_Reactor.h: Moved the definition of WSANETWORKEVENTS to
+	  before its use.  Thanks to Craig Perras <cperras@watchguard.com>
+	  for reporting this.
+
 Tue May 23 17:59:06 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* ACE_wrappers/pace/pace:
@@ -8,11 +14,11 @@ Tue May 23 17:59:06 2000  Luther J Baker  <luther@cs.wustl.edu>
 Tue May 23 16:37:27 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* ACE_wrappers/pace directories added to ACE_wrappers:
-	
+
 	      ACE_wrappers/pace/docs
 	      ACE_wrappers/pace/examples
 	      ACE_wrappers/pace/pace
-	      ACE_wrappers/pace/pace++	
+	      ACE_wrappers/pace/pace++
 	      ACE_wrappers/pace/tests
 
 Mon May 22 15:26:42 2000  Steve Huston  <shuston@riverace.com>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index dabe607d26d..d07e5aa810c 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Tue May 23 20:13:52 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/WFMO_Reactor.h: Moved the definition of WSANETWORKEVENTS to
+	  before its use.  Thanks to Craig Perras <cperras@watchguard.com>
+	  for reporting this.
+
 Tue May 23 17:59:06 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* ACE_wrappers/pace/pace:
@@ -8,11 +14,11 @@ Tue May 23 17:59:06 2000  Luther J Baker  <luther@cs.wustl.edu>
 Tue May 23 16:37:27 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* ACE_wrappers/pace directories added to ACE_wrappers:
-	
+
 	      ACE_wrappers/pace/docs
 	      ACE_wrappers/pace/examples
 	      ACE_wrappers/pace/pace
-	      ACE_wrappers/pace/pace++	
+	      ACE_wrappers/pace/pace++
 	      ACE_wrappers/pace/tests
 
 Mon May 22 15:26:42 2000  Steve Huston  <shuston@riverace.com>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index dabe607d26d..d07e5aa810c 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Tue May 23 20:13:52 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/WFMO_Reactor.h: Moved the definition of WSANETWORKEVENTS to
+	  before its use.  Thanks to Craig Perras <cperras@watchguard.com>
+	  for reporting this.
+
 Tue May 23 17:59:06 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* ACE_wrappers/pace/pace:
@@ -8,11 +14,11 @@ Tue May 23 17:59:06 2000  Luther J Baker  <luther@cs.wustl.edu>
 Tue May 23 16:37:27 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* ACE_wrappers/pace directories added to ACE_wrappers:
-	
+
 	      ACE_wrappers/pace/docs
 	      ACE_wrappers/pace/examples
 	      ACE_wrappers/pace/pace
-	      ACE_wrappers/pace/pace++	
+	      ACE_wrappers/pace/pace++
 	      ACE_wrappers/pace/tests
 
 Mon May 22 15:26:42 2000  Steve Huston  <shuston@riverace.com>
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 9515a166ae7..7b44bf477d6 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -30,6 +30,44 @@
 #include "ace/Reactor_Impl.h"
 #include "ace/Message_Queue.h"
 
+// If we don't have WinSOCK2, we need these defined
+#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
+/*
+ * WinSock 2 extension -- bit values and indices for FD_XXX network events
+ */
+#define FD_READ_BIT      0
+#define FD_WRITE_BIT     1
+#define FD_OOB_BIT       2
+#define FD_ACCEPT_BIT    3
+#define FD_CONNECT_BIT   4
+#define FD_CLOSE_BIT     5
+#define FD_QOS_BIT       6
+#define FD_GROUP_QOS_BIT 7
+
+#define FD_QOS           (1 << FD_QOS_BIT)
+#define FD_GROUP_QOS     (1 << FD_GROUP_QOS_BIT)
+
+#define FD_MAX_EVENTS    8
+#define FD_ALL_EVENTS    ((1 << FD_MAX_EVENTS) - 1)
+
+#define WSAEVENT                HANDLE
+
+typedef struct _WSANETWORKEVENTS
+{
+  long lNetworkEvents;
+  int iErrorCode[FD_MAX_EVENTS];
+} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
+
+int WSAEventSelect (SOCKET s,
+                    WSAEVENT hEventObject,
+                    long lNetworkEvents);
+
+int WSAEnumNetworkEvents (SOCKET s,
+                          WSAEVENT hEventObject,
+                          LPWSANETWORKEVENTS lpNetworkEvents);
+
+#endif /* !defined ACE_HAS_WINSOCK2 */
+
 // Forward decl.
 class ACE_WFMO_Reactor;
 class ACE_Handle_Set;
@@ -1121,44 +1159,6 @@ private:
   // Deny access since member-wise won't work...
 };
 
-// If we don't have WinSOCK2, we need these defined
-#if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
-/*
- * WinSock 2 extension -- bit values and indices for FD_XXX network events
- */
-#define FD_READ_BIT      0
-#define FD_WRITE_BIT     1
-#define FD_OOB_BIT       2
-#define FD_ACCEPT_BIT    3
-#define FD_CONNECT_BIT   4
-#define FD_CLOSE_BIT     5
-#define FD_QOS_BIT       6
-#define FD_GROUP_QOS_BIT 7
-
-#define FD_QOS           (1 << FD_QOS_BIT)
-#define FD_GROUP_QOS     (1 << FD_GROUP_QOS_BIT)
-
-#define FD_MAX_EVENTS    8
-#define FD_ALL_EVENTS    ((1 << FD_MAX_EVENTS) - 1)
-
-#define WSAEVENT                HANDLE
-
-typedef struct _WSANETWORKEVENTS
-{
-  long lNetworkEvents;
-  int iErrorCode[FD_MAX_EVENTS];
-} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
-
-int WSAEventSelect (SOCKET s,
-                    WSAEVENT hEventObject,
-                    long lNetworkEvents);
-
-int WSAEnumNetworkEvents (SOCKET s,
-                          WSAEVENT hEventObject,
-                          LPWSANETWORKEVENTS lpNetworkEvents);
-
-#endif /* !defined ACE_HAS_WINSOCK2 */
-
 #endif /* ACE_WIN32 */
 
 #if defined (__ACE_INLINE__)