Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,5 @@
// $Id: Flag_Manip.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "ace/Flag_Manip.h"
#if defined (ACE_LACKS_FCNTL)
@ -5,10 +7,6 @@
# include "ace/OS_NS_errno.h"
#endif /* ACE_LACKS_FCNTL */
#if defined (ACE_LACKS_IOCTL)
# include "ace/OS_NS_devctl.h"
#endif
#if !defined (__ACE_INLINE__)
#include "ace/Flag_Manip.inl"
#endif /* __ACE_INLINE__ */
@ -33,13 +31,7 @@ ACE::set_flags (ACE_HANDLE handle, int flags)
// blocking: (0)
{
int nonblock = 1;
# if defined (ACE_LACKS_IOCTL)
int dev_info;
return ACE_OS::posix_devctl (handle, FIONBIO, &nonblock,
sizeof nonblock, &dev_info);
# else
return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
# endif
}
default:
ACE_NOTSUP_RETURN (-1);
@ -66,6 +58,7 @@ int
ACE::clr_flags (ACE_HANDLE handle, int flags)
{
ACE_TRACE ("ACE::clr_flags");
#if defined (ACE_LACKS_FCNTL)
switch (flags)
{
@ -74,13 +67,7 @@ ACE::clr_flags (ACE_HANDLE handle, int flags)
// blocking: (0)
{
int nonblock = 0;
# if defined (ACE_LACKS_IOCTL)
int dev_info;
return ACE_OS::posix_devctl (handle, FIONBIO, &nonblock,
sizeof nonblock, &dev_info);
# else
return ACE_OS::ioctl (handle, FIONBIO, &nonblock);
# endif
}
default:
ACE_NOTSUP_RETURN (-1);