diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-02-08 09:13:35 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-02-08 09:13:35 +0100 |
| commit | 550ed403e65faad8ca8238e224ee85920407ad68 (patch) | |
| tree | 3dd54942ca77290bd7b9ca38552a7141be946dbe /ACE | |
| parent | 1bc4b9466bed1380c4e1b9b674eb9e3537f59bb2 (diff) | |
| download | ATCD-550ed403e65faad8ca8238e224ee85920407ad68.tar.gz | |
Tweaked code to not call unsupported methods
* ACE/ace/Dev_Poll_Reactor.cpp:
* ACE/ace/Select_Reactor_Base.cpp:
* ACE/ace/config-face-safety.h:
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/Dev_Poll_Reactor.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Select_Reactor_Base.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/config-face-safety.h | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 8d2abc60ef8..4d85a709297 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -76,7 +76,7 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r, if (this->notification_pipe_.open () == -1) return -1; -#if defined (F_SETFD) +#if defined (F_SETFD) && !defined (ACE_LACKS_FCNTL) // close-on-exec if (ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1) == -1) { diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index e48e2b2d3e3..f5d5252dec6 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -610,7 +610,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r, if (this->notification_pipe_.open () == -1) return -1; -#if defined (F_SETFD) +#if defined (F_SETFD) && !defined (ACE_LACKS_FCNTL) if (ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1) == -1) { return -1; diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h index 23b4befb75a..adfb8ca6630 100644 --- a/ACE/ace/config-face-safety.h +++ b/ACE/ace/config-face-safety.h @@ -89,9 +89,6 @@ # ifndef ACE_LACKS_FCNTL # define ACE_LACKS_FCNTL # endif -# if defined (F_SETFD) -# undef F_SETFD -# endif # ifndef ACE_LACKS_FORK # define ACE_LACKS_FORK |