summaryrefslogtreecommitdiff
path: root/TAO/tao/Connection_Handler.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-12-16 15:48:48 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-12-16 15:48:48 +0000
commit8dbdbea7418dfcf005f5c5ee04e0cb556593caa3 (patch)
treec743c182450bc94d6398bddf20304095233b292b /TAO/tao/Connection_Handler.cpp
parent9ab4bb4925f884f2897380be3e71989043c29128 (diff)
downloadATCD-8dbdbea7418dfcf005f5c5ee04e0cb556593caa3.tar.gz
Tue Dec 16 15:49:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Connection_Handler.cpp')
-rw-r--r--TAO/tao/Connection_Handler.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 92eb3e5033a..64c5d212c8d 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -67,8 +67,7 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
int snd_size,
int rcv_size)
{
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-
+#if !defined (ACE_LACKS_SO_SNDBUF)
if (snd_size != 0
&& sock.set_option (SOL_SOCKET,
SO_SNDBUF,
@@ -78,7 +77,9 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
{
return -1;
}
+#endif /* !ACE_LACKS_SO_SNDBUF */
+#if !defined (ACE_LACKS_SO_RCVBUF)
if (rcv_size != 0
&& sock.set_option (SOL_SOCKET,
SO_RCVBUF,
@@ -88,10 +89,12 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
{
return -1;
}
-#else
+#endif /* !ACE_LACKS_SO_RCVBUF */
+
+#if defined (ACE_LACKS_SO_SNDBUF) && defined (ACE_LACKS_SO_RCVBUF)
ACE_UNUSED_ARG (snd_size);
ACE_UNUSED_ARG (rcv_size);
-#endif /* !ACE_LACKS_SOCKET_BUFSIZ */
+#endif
// Set the close-on-exec flag for that file descriptor. If the
// operation fails we are out of luck (some platforms do not support