summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-16 20:05:27 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-16 20:05:27 +0000
commit3641aab16c61f686aff57e7d2bd2e9c190bf8010 (patch)
treece33a44c8df878f41cc6af2fdffd318de840bab4 /ace
parenta9012b2e021f184cd37487f4999adb7d649b1091 (diff)
downloadATCD-3641aab16c61f686aff57e7d2bd2e9c190bf8010.tar.gz
ChangeLogTag:Thu Jul 16 15:02:55 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'ace')
-rw-r--r--ace/IPC_SAP.cpp13
-rw-r--r--ace/Synch_T.h2
2 files changed, 14 insertions, 1 deletions
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index 4def604e1d6..13c1aa16876 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -56,6 +56,7 @@ ACE_IPC_SAP::enable (int signum) const
u_long nonblock = 1;
return ACE_OS::ioctl (this->handle_, FIONBIO, &nonblock);
}
+ case
default:
ACE_NOTSUP_RETURN (-1);
}
@@ -82,6 +83,12 @@ ACE_IPC_SAP::enable (int signum) const
return -1;
#endif /* F_SETOWN && FASYNC */
#endif /* SIGIO <== */
+ case F_SETFD:
+ if (ACE_OS::fcntl (this->handle_, F_SETFD, 1) == -1)
+ return 1;
+ else
+ return 0;
+ break;
case ACE_NONBLOCK:
if (ACE::set_flags (this->handle_, ACE_NONBLOCK) == ACE_INVALID_HANDLE)
return -1;
@@ -139,6 +146,12 @@ ACE_IPC_SAP::disable (int signum) const
return -1;
#endif /* F_SETOWN && FASYNC */
#endif /* SIGIO <== */
+ case F_SETFD:
+ if (ACE_OS::fcntl (this->handle_, F_SETFD, 0) == -1)
+ return 1;
+ else
+ return 0;
+ break;
case ACE_NONBLOCK:
if (ACE::clr_flags (this->handle_, ACE_NONBLOCK) == -1)
return -1;
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 2633c1361f7..295045082d3 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -854,7 +854,7 @@ public:
#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex
#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Recursive_Thread_Mutex
#define ACE_SYNCH_RW_MUTEX ACE_RW_Thread_Mutex
-#define ACE_SYNCH_CONDITION ACE_Thread_Condition<ACE_Thread_Mutex>
+#define ACE_SYNCH_CONDITION ACE_Condition_Thread_Mutex
#define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore
#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex