diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-04-06 11:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 11:09:11 +0200 |
| commit | a3a7c2a50383ebf00534c28014704ce57e092821 (patch) | |
| tree | 0de4a576c9929ac6d821462e1693882654f2a456 /ACE/ace/SPIPE_Connector.cpp | |
| parent | 5625244fd7bb77bafabce28fdec790f51ef50080 (diff) | |
| parent | b50aba0fdce1069b9aa9b1baac9adee396663779 (diff) | |
| download | ATCD-a3a7c2a50383ebf00534c28014704ce57e092821.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/SPIPE_Connector.cpp')
| -rw-r--r-- | ACE/ace/SPIPE_Connector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index c507b47ee92..2822fa82b53 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -67,7 +67,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, ACE_HANDLE handle; ACE_UNUSED_ARG (pipe_mode); -#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) // We need to allow for more than one attempt to connect, // calculate the absolute time at which we give up. ACE_Time_Value absolute_time; @@ -143,11 +143,11 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } } } -#else /* ACE_WIN32 && !ACE_HAS_PHARLAP */ +#else /* ACE_WIN32 */ handle = ACE::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP */ +#endif /* !ACE_WIN32 */ new_io.set_handle (handle); new_io.remote_addr_ = remote_sap; // class copy. |