diff options
| -rw-r--r-- | ace/Synch.cpp | 9 | ||||
| -rw-r--r-- | ace/Synch_T.h | 6 | ||||
| -rw-r--r-- | ace/TTY_IO.cpp | 24 |
3 files changed, 28 insertions, 11 deletions
diff --git a/ace/Synch.cpp b/ace/Synch.cpp index 288ad2f434e..e8d8d06728a 100644 --- a/ace/Synch.cpp +++ b/ace/Synch.cpp @@ -700,12 +700,9 @@ ACE_Condition_Thread_Mutex::wait (ACE_Thread_Mutex &mutex, const ACE_Time_Value *abstime) { // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); - if (abstime == 0) - return ACE_OS::cond_wait (&this->cond_, &mutex_.lock_); - else - return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, - (ACE_Time_Value *) abstime); + return ACE_OS::cond_timedwait (&this->cond_, + &mutex.lock_, + (ACE_Time_Value *) abstime); } int diff --git a/ace/Synch_T.h b/ace/Synch_T.h index f7f751504ef..39280603564 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -746,13 +746,13 @@ public: #define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex #endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ #define ACE_SYNCH_MUTEX ACE_Thread_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex; -#define ACE_SYNCH_PROCESS_MUTEX ACE_Process_Mutex; +#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex +#define ACE_SYNCH_PROCESS_MUTEX ACE_Process_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 #define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex; +#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ #define ACE_SYNCH ACE_MT_SYNCH diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp index 064b338d78c..23239eb0fc8 100644 --- a/ace/TTY_IO.cpp +++ b/ace/TTY_IO.cpp @@ -11,7 +11,14 @@ ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const { #if defined (ACE_HAS_TERM_IOCTLS) +#if defined(TCGETS) struct termios devpar; +#elif defined(TCGETA) + struct termio devpar; +#else + errno = ENOSYS; + return -1; +#endif u_long c_iflag; u_long c_oflag; u_long c_cflag; @@ -27,8 +34,14 @@ ACE_TTY_IO::control (Control_Mode cmd, c_line=0; // Get default device parameters. - + +#if defined(TCGETS) if (this->ACE_IO_SAP::control (TCGETS, (void *) &devpar) == -1) +#elif defined(TCGETA) + if (this->ACE_IO_SAP::control (TCGETA, (void *) &devpar) == -1) +#else + errno = ENOSYS; +#endif return -1; switch (cmd) @@ -118,8 +131,15 @@ ACE_TTY_IO::control (Control_Mode cmd, devpar.c_lflag = c_lflag; devpar.c_cc[4] = ivmin_cc4; devpar.c_cc[5] = ivtime_cc5; - + +#if defined(TCSETS) return this->ACE_IO_SAP::control (TCSETS, (void *) &devpar); +#elif defined(TCSETA) + return this->ACE_IO_SAP::control (TCSETA, (void *) &devpar); +#else + errno = ENOSYS; + return -1; +#endif case GETPARAMS: return -1; // Not yet implemented. |