diff options
| author | msmit <msmit@remedy.nl> | 2009-05-29 13:38:50 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-05-29 13:38:50 +0000 |
| commit | f43efb8a215a5d8c4ec811058da8f72e20bc597c (patch) | |
| tree | bf4b3e2d2438ffae08cddcbb9620ed5a79933807 | |
| parent | 88695b459c9c1790b07d277df5dc77b7a9c672ce (diff) | |
| download | ATCD-f43efb8a215a5d8c4ec811058da8f72e20bc597c.tar.gz | |
Fri May 29 13:36:05 2009 Marcel Smit <msmit@remedy.nl>
* ace/OS_NS_stropts.cpp:
* ace/OS_NS_sys_socket.cpp:
* include/makeinclude/platform_cegcc.GNU:
Fixed compiler error for QoS when compiler is CE gcc.
Removed UNDER_CE < 500.
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stropts.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.cpp | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_cegcc.GNU | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 236d9627030..084fdc4aae9 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Fri May 29 13:36:05 2009 Marcel Smit <msmit@remedy.nl> + + * ace/OS_NS_stropts.cpp: + * ace/OS_NS_sys_socket.cpp: + * include/makeinclude/platform_cegcc.GNU: + + Fixed compiler error for QoS when compiler is CE gcc. + Removed UNDER_CE < 500. + Fri May 29 11:41:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/QoS/qos.mpc: diff --git a/ACE/ace/OS_NS_stropts.cpp b/ACE/ace/OS_NS_stropts.cpp index 4bde7d4ae9c..4a4023e0054 100644 --- a/ACE/ace/OS_NS_stropts.cpp +++ b/ACE/ace/OS_NS_stropts.cpp @@ -47,7 +47,6 @@ ACE_OS::ioctl (ACE_HANDLE socket, # endif /* ACE_HAS_WINSOCK2 */ } -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) int ACE_OS::ioctl (ACE_HANDLE socket, unsigned long io_control_code, @@ -190,6 +189,5 @@ ACE_OS::ioctl (ACE_HANDLE socket, ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_WINSOCK2 */ } -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp index bbf468f4e63..06d523c2ea0 100644 --- a/ACE/ace/OS_NS_sys_socket.cpp +++ b/ACE/ace/OS_NS_sys_socket.cpp @@ -14,7 +14,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_OS::socket_initialized_; #endif /* ACE_WIN32 */ -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) ACE_HANDLE ACE_OS::accept (ACE_HANDLE handle, struct sockaddr *addr, @@ -95,7 +94,6 @@ ACE_OS::join_leaf (ACE_HANDLE socket, ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); # endif /* ACE_HAS_WINSOCK2 */ } -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ int ACE_OS::socket_init (int version_high, int version_low) diff --git a/ACE/include/makeinclude/platform_cegcc.GNU b/ACE/include/makeinclude/platform_cegcc.GNU index 97512b3c8c5..a31252a2eba 100644 --- a/ACE/include/makeinclude/platform_cegcc.GNU +++ b/ACE/include/makeinclude/platform_cegcc.GNU @@ -42,5 +42,6 @@ COMPARCH ?= i386-mingw32ce- LIBS += -lcoredll -lmingw32 -lmingwex -lws2 -lsupc++ -liphlpapi no_hidden_visibility ?= 1 +qos ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU |