1 files changed, 2 insertions, 5 deletions
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index a6e359ef34b..a5c1260f0b8 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -1299,12 +1299,9 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options,
   if (options[ACE_Synch_Options::USE_REACTOR] == 1)
     // Asynchronous.
     {
-      int error = errno;
-      // if (options[ACE_Synch_Options::USE_TIMEOUT] == 1)
-      // ACE_ERROR_RETURN ((LM_ERROR, "Timeouts not yet supported" "
-      // with asynchronous operations."), -1);
+      // Save/restore errno.
+      ACE_Errno_Guard error (errno);
       cv.mutex ().release ();
-      errno = error;
       ACE_RETURN (-1);
     }
   else