summaryrefslogtreecommitdiff
path: root/TAO/tao/IIOP_Connection_Handler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/IIOP_Connection_Handler.cpp')
-rw-r--r--TAO/tao/IIOP_Connection_Handler.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index bf4bb930103..12012fb0afe 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -669,6 +669,11 @@ TAO_IIOP_Connection_Handler::abort (void)
struct linger lval = { 0 };
lval.l_onoff = 1;
+#if !defined(ACE_HAS_LINGER_MS)
+ // Redundantly set the l_linger member to appease gcc
+ lval.l_linger = 0;
+#endif
+
if (this->peer ().set_option(SOL_SOCKET,
SO_LINGER,
(void*) &lval,