ChangeLogTag:Wed Mar 26 16:48:31 2003 Steve Huston <shuston@riverace.com>

4 files changed, 53 insertions, 7 deletions

diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 7359decf04b..18922660461 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -3,7 +3,7 @@
 #include "ace/Reactor.h"
 #include "ace/Reactor_Impl.h"
 #include "ace/Handle_Set.h"
-#if !defined (ACE_HAS_WINCE)
+//#if !defined (ACE_HAS_WINCE)
 #  if !defined (ACE_LACKS_ACE_SVCCONF)
 #    include "ace/Service_Config.h"
 #  endif /* !ACE_LACKS_ACE_SVCCONF */
@@ -11,7 +11,7 @@
 #    include "ace/WFMO_Reactor.h"
 #    include "ace/Msg_WFMO_Reactor.h"
 #  endif /* ACE_WIN32 */
-#endif /* ! ACE_HAS_WINCE */
+//#endif /* ! ACE_HAS_WINCE */
 #include "ace/Select_Reactor.h"
 #include "ace/TP_Reactor.h"
 #include "ace/Object_Manager.h"
diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i
index 854f33be498..c52523d28b7 100644
--- a/ace/SPIPE_Stream.i
+++ b/ace/SPIPE_Stream.i
@@ -98,7 +98,8 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
 #if defined (ACE_HAS_STREAM_PIPES)
   return ACE_OS::ioctl (this->get_handle (), I_SENDFD, (void *) handle);
 #elif defined (ACE_WIN32) && \
-      (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+      (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) && \
+       !defined (ACE_HAS_WINCE)   /* CE4 has WS2 but not WSADuplicateSocket */
   DWORD procID;
   WSAPROTOCOL_INFO protInfo;
   ssize_t res;
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index a34baa7b34c..0f93b2eaed6 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -236,7 +236,6 @@ typedef long off_t;
 //#endif  // UNDER_CE
 
 #define ACE_HAS_STRDUP_EMULATION
-#define ACE_HAS_WINSOCK2 0
 
 // CE doesn't have <sys/types.h> instead <types.h>
 #define ACE_HAS_FLAT_TYPES_H
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index be75f9c28f7..2031b5b6328 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -423,19 +423,65 @@ typedef unsigned long long ACE_UINT64;
 # if !defined (_WINSOCK2API_)
 // will also include windows.h, if not present
 #  include /**/ <winsock2.h>
+// WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that
+// here. This is all lifted from the #if 0'd out part of winsock2.h.
+#  if !defined EWOULDBLOCK
+#    define EWOULDBLOCK             WSAEWOULDBLOCK
+#    define EINPROGRESS             WSAEINPROGRESS
+#    define EALREADY                WSAEALREADY
+#    define ENOTSOCK                WSAENOTSOCK
+#    define EDESTADDRREQ            WSAEDESTADDRREQ
+#    define EMSGSIZE                WSAEMSGSIZE
+#    define EPROTOTYPE              WSAEPROTOTYPE
+#    define ENOPROTOOPT             WSAENOPROTOOPT
+#    define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
+#    define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
+#    define EOPNOTSUPP              WSAEOPNOTSUPP
+#    define EPFNOSUPPORT            WSAEPFNOSUPPORT
+#    define EAFNOSUPPORT            WSAEAFNOSUPPORT
+#    define EADDRINUSE              WSAEADDRINUSE
+#    define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
+#    define ENETDOWN                WSAENETDOWN
+#    define ENETUNREACH             WSAENETUNREACH
+#    define ENETRESET               WSAENETRESET
+#    define ECONNABORTED            WSAECONNABORTED
+#    define ECONNRESET              WSAECONNRESET
+#    define ENOBUFS                 WSAENOBUFS
+#    define EISCONN                 WSAEISCONN
+#    define ENOTCONN                WSAENOTCONN
+#    define ESHUTDOWN               WSAESHUTDOWN
+#    define ETOOMANYREFS            WSAETOOMANYREFS
+#    define ETIMEDOUT               WSAETIMEDOUT
+#    define ECONNREFUSED            WSAECONNREFUSED
+#    define ELOOP                   WSAELOOP
+#    define ENAMETOOLONG            WSAENAMETOOLONG
+#    define EHOSTDOWN               WSAEHOSTDOWN
+#    define EHOSTUNREACH            WSAEHOSTUNREACH
+#    define ENOTEMPTY               WSAENOTEMPTY
+#    define EPROCLIM                WSAEPROCLIM
+#    define EUSERS                  WSAEUSERS
+#    define EDQUOT                  WSAEDQUOT
+#    define ESTALE                  WSAESTALE
+#    define EREMOTE                 WSAEREMOTE
+#  endif /* !defined (EWOULDBLOCK) */
 # endif /* _WINSOCK2API */
 
 # if defined (ACE_HAS_FORE_ATM_WS2)
 #  include /**/ <ws2atm.h>
 # endif /*ACE_HAS_FORE_ATM_WS2 */
 
-# if !defined _MSWSOCK_
+// CE doesn't have Microsoft Winsock 2 extensions
+# if !defined _MSWSOCK_ && !defined (ACE_HAS_WINCE)
 #  include /**/ <mswsock.h>
 # endif /* _MSWSOCK_ */
 
 # if defined (_MSC_VER)
-#  pragma comment(lib, "ws2_32.lib")
-#  pragma comment(lib, "mswsock.lib")
+#  if defined (ACE_HAS_WINCE)
+#    pragma comment(lib, "ws2.lib")
+#  else
+#    pragma comment(lib, "ws2_32.lib")
+#    pragma comment(lib, "mswsock.lib")
+#  endif /* ACE_HAS_WINCE */
 # endif /* _MSC_VER */
 
 # define ACE_WSOCK_VERSION 2, 0