diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 496beb108b..c3cfb5501f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2006-11-17 Joel Sherrill + + * posix/src/semtimedwait.c: Reverse accidentally included + semtimedwait.c. + 2006-11-17 Joel Sherrill * posix/src/keygetspecific.c, posix/src/keysetspecific.c, diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 662845ecd9..b0cb78deca 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -48,18 +48,18 @@ int sem_timedwait( blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; else #endif - if ( abstime->tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) { - blocking = CORE_SEMAPHORE_BAD_TIMEOUT; - } else { - clock_gettime( CLOCK_REALTIME, ¤t_time ); + if ( abstime->tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) + blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; + else { + (void) clock_gettime( CLOCK_REALTIME, ¤t_time ); /* * Make sure the abstime is in the future */ if ( abstime->tv_sec < current_time.tv_sec ) - blocking = CORE_SEMAPHORE_BAD_TIMEOUT; + blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; else if ( (abstime->tv_sec == current_time.tv_sec) && (abstime->tv_nsec <= current_time.tv_nsec) ) - blocking = CORE_SEMAPHORE_BAD_TIMEOUT; + blocking = CORE_SEMAPHORE_BAD_TIMEOUT_VALUE; else { _POSIX_Timespec_subtract( ¤t_time, abstime, &difference ); ticks = _POSIX_Timespec_to_interval( &difference );