diff options
Diffstat (limited to 'ace/OS_NS_stropts.h')
| -rw-r--r-- | ace/OS_NS_stropts.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ace/OS_NS_stropts.h b/ace/OS_NS_stropts.h index 9b1f6fc2f56..69685193150 100644 --- a/ace/OS_NS_stropts.h +++ b/ace/OS_NS_stropts.h @@ -25,10 +25,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -# ifndef ACE_IOCTL_TYPE_ARG2 -# define ACE_IOCTL_TYPE_ARG2 int -# endif - #include "ace/os_include/os_stropts.h" #include "ace/os_include/os_stdio.h" #include "ace/ACE_export.h" @@ -109,9 +105,10 @@ namespace ACE_OS { /// UNIX-style <ioctl>. ACE_NAMESPACE_INLINE_FUNCTION int ioctl (ACE_HANDLE handle, - ACE_IOCTL_TYPE_ARG2 cmd, + int cmd, void * = 0); +#if !defined (ACE_HAS_WINCE) /// QoS-enabled <ioctl>. extern ACE_Export int ioctl (ACE_HANDLE socket, @@ -124,7 +121,6 @@ namespace ACE_OS { ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func); -#if !defined (ACE_HAS_WINCE) /// QoS-enabled <ioctl> when the I/O control code is either /// SIO_SET_QOS or SIO_GET_QOS. extern ACE_Export @@ -136,7 +132,7 @@ namespace ACE_OS { unsigned long buffer = 0, ACE_OVERLAPPED *overlapped = 0, ACE_OVERLAPPED_COMPLETION_FUNC func = 0); -#endif /* ACE_HAS_WINCE */ +#endif // ACE_HAS_WINCE ACE_NAMESPACE_INLINE_FUNCTION int isastream (ACE_HANDLE handle); |