diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-31 19:23:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-31 19:23:44 +0000 |
| commit | 4e5e4a18910d82fe4f3f676539fba2eed7eb3e16 (patch) | |
| tree | 6cb40fa82b4db78a430322ab03b9b594993d3106 | |
| parent | 4973adbda46ba943304777f1f099eed5c447a277 (diff) | |
| download | ATCD-4e5e4a18910d82fe4f3f676539fba2eed7eb3e16.tar.gz | |
Mon Jul 31 19:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stropts.inl | 2 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks5.x.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.2.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.3.h | 1 |
5 files changed, 15 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ed2c667990a..a74e069c43e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Mon Jul 31 19:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_stropts.inl (ioctl): + Check for ACE_HAS_IOCTL_INT_3_PARAM to make it easier to handle + the different VxWorks versions + + * config-vxworks5.x.h: + * config-vxworks6.2.h: + * config-vxworks6.3.h: + Added ACE_HAS_IOCTL_INT_3_PARAM + Mon Jul 31 18:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * Containers_T.{h,cpp}: diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl index 0f45781c65a..e6feea48f1d 100644 --- a/ACE/ace/OS_NS_stropts.inl +++ b/ACE/ace/OS_NS_stropts.inl @@ -114,7 +114,7 @@ ACE_OS::ioctl (ACE_HANDLE handle, #if defined (ACE_WIN32) ACE_SOCKET sock = (ACE_SOCKET) handle; ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, reinterpret_cast<unsigned long *> (val)), int, -1); -#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x620) +#elif defined (ACE_HAS_IOCTL_INT_3_PARAM) ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)), int, -1); #else diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h index 22ca2fa37b3..469c1cacfc6 100644 --- a/ACE/ace/config-vxworks5.x.h +++ b/ACE/ace/config-vxworks5.x.h @@ -123,6 +123,7 @@ #define ACE_HAS_DIRENT #define ACE_HAS_DLL 0 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_IOCTL_INT_3_PARAM #define ACE_HAS_MSG #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_SELECT_TIMEVAL diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h index c3624fd82c1..fa680b8c6e4 100644 --- a/ACE/ace/config-vxworks6.2.h +++ b/ACE/ace/config-vxworks6.2.h @@ -98,6 +98,7 @@ #define ACE_HAS_DIRENT #define ACE_HAS_DLL 0 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_IOCTL_INT_3_PARAM #define ACE_HAS_MSG #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_SELECT_TIMEVAL diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h index 5212287b2ea..37a37bd937a 100644 --- a/ACE/ace/config-vxworks6.3.h +++ b/ACE/ace/config-vxworks6.3.h @@ -216,6 +216,7 @@ #define ACE_LACKS_FGETWC #define ACE_LACKS_FGETWS #define ACE_LACKS_FPUTWS + #define ACE_HAS_IOCTL_INT_3_PARAM #if !defined (ACE_MAIN) # define ACE_MAIN ace_main #endif /* ! ACE_MAIN */ |