ChangeLogTag:Mon Feb 10 18:02:41 2003 Steve Huston <shuston@riverace.com>

6 files changed, 32 insertions, 43 deletions

diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 5df1eb3c128..731ca256f7f 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -53,11 +53,6 @@ public:
    */
   ACE_Handle_Set (const ACE_FD_SET_TYPE &mask);
 
-#if defined (ACE_HAS_WINCE)
-  /// Default dtor.
-  ~ACE_Handle_Set (void);
-#endif /* ACE_HAS_WINCE */
-
   // = Methods for manipulating bitsets.
   /// Initialize the bitmask to all 0s and reset the associated fields.
   void reset (void);
diff --git a/ace/Handle_Set.i b/ace/Handle_Set.i
index ef291f535c1..93d84c3ec77 100644
--- a/ace/Handle_Set.i
+++ b/ace/Handle_Set.i
@@ -5,14 +5,6 @@
 
 // Initialize the bitmask to all 0s and reset the associated fields.
 
-#if defined (ACE_HAS_WINCE)
-ACE_INLINE
-ACE_Handle_Set::~ACE_Handle_Set (void)
-{
-  ACE_TRACE ("ACE_Handle_Set::~ACE_Handle_Set");
-}
-#endif /* ACE_HAS_WINCE */
-
 ACE_INLINE void
 ACE_Handle_Set::reset (void)
 {
diff --git a/ace/OS.h b/ace/OS.h
index 0bf82b68d09..a57ff7b7677 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -2729,37 +2729,29 @@ typedef void (*ACE_SignalHandlerV)(...);
 
 #   define ACE_INVALID_SEM_KEY 0
 
-#   if defined (ACE_HAS_WINCE)
-// @@ WinCE probably doesn't have structural exception support
-//    But I need to double check to find this out
+#   if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
 #     define ACE_SEH_TRY if (1)
 #     define ACE_SEH_EXCEPT(X) while (0)
 #     define ACE_SEH_FINALLY if (1)
-#   else
-#     if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
+#   elif defined(__BORLANDC__)
+#     if (__BORLANDC__ >= 0x0530) /* Borland C++ Builder 3.0 */
+#       define ACE_SEH_TRY try
+#       define ACE_SEH_EXCEPT(X) __except(X)
+#       define ACE_SEH_FINALLY __finally
+#     else
 #       define ACE_SEH_TRY if (1)
 #       define ACE_SEH_EXCEPT(X) while (0)
 #       define ACE_SEH_FINALLY if (1)
-#     elif defined(__BORLANDC__)
-#       if (__BORLANDC__ >= 0x0530) /* Borland C++ Builder 3.0 */
-#         define ACE_SEH_TRY try
-#         define ACE_SEH_EXCEPT(X) __except(X)
-#         define ACE_SEH_FINALLY __finally
-#       else
-#         define ACE_SEH_TRY if (1)
-#         define ACE_SEH_EXCEPT(X) while (0)
-#         define ACE_SEH_FINALLY if (1)
-#       endif
-#     elif defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#         define ACE_SEH_TRY if (1)
-#         define ACE_SEH_EXCEPT(X) while (0)
-#         define ACE_SEH_FINALLY if (1)
-#     else
-#       define ACE_SEH_TRY __try
-#       define ACE_SEH_EXCEPT(X) __except(X)
-#       define ACE_SEH_FINALLY __finally
-#     endif /* __BORLANDC__ */
-#   endif /* ACE_HAS_WINCE */
+#     endif
+#   elif defined (__IBMCPP__) && (__IBMCPP__ >= 400)
+#     define ACE_SEH_TRY if (1)
+#     define ACE_SEH_EXCEPT(X) while (0)
+#     define ACE_SEH_FINALLY if (1)
+#   else
+#     define ACE_SEH_TRY __try
+#     define ACE_SEH_EXCEPT(X) __except(X)
+#     define ACE_SEH_FINALLY __finally
+#   endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
 // The "null" device on Win32.
 #   define ACE_DEV_NULL "nul"
diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i
index 081a8ab4596..854f33be498 100644
--- a/ace/SPIPE_Stream.i
+++ b/ace/SPIPE_Stream.i
@@ -97,7 +97,8 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
   ACE_TRACE ("ACE_SPIPE_Stream::send_handle");
 #if defined (ACE_HAS_STREAM_PIPES)
   return ACE_OS::ioctl (this->get_handle (), I_SENDFD, (void *) handle);
-#elif defined (ACE_WIN32)
+#elif defined (ACE_WIN32) && \
+      (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   DWORD procID;
   WSAPROTOCOL_INFO protInfo;
   ssize_t res;
@@ -151,7 +152,8 @@ ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const
       handle = recvfd.fd;
       return 0;
     }
-#elif defined (ACE_WIN32)
+#elif defined (ACE_WIN32) && \
+      (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   pid_t procID = ACE_OS::getpid();
   WSAPROTOCOL_INFO protInfo;
   ssize_t res;
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 0319898c3c5..a34baa7b34c 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -23,6 +23,13 @@
 # error ACE requires Windows CE 3.0 and later.
 #endif  // UNDER_CE
 
+// CE 3 doesn't have Winsock 2, but CE 4 does.
+#if (UNDER_CE < 400)
+# if !defined (ACE_HAS_WINSOCK2)
+#  define ACE_HAS_WINSOCK2 0
+# endif
+#endif /* UNDER_CE < 400 */
+
 #if !defined (ACE_HAS_WINCE)
 # define ACE_HAS_WINCE 1
 #endif
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 78fe852c7b3..be75f9c28f7 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -175,11 +175,12 @@
 #if !defined (ACE_HAS_WINCE)
 // Platform supports pread() and pwrite()
 # define ACE_HAS_P_READ_WRITE
-# if !defined (__MINGW32__)
-#  define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
-# endif /* __MINGW32__ */
 #endif /* ! ACE_HAS_WINCE */
 
+#if !defined (__MINGW32__)
+# define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
+#endif /* __MINGW32__ */
+
 #define ACE_DEFAULT_THREAD_PRIORITY 0
 
 #define ACE_HAS_RECURSIVE_MUTEXES