diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-07-28 14:45:42 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-07-28 14:54:51 +0200 |
| commit | 21789a2117f7485000e0d88c3f76a6b9d507bb5a (patch) | |
| tree | f14a8eee3d9c10fd673c43f55f7a50d9b5b58b05 /cpukit/posix/src/condtimedwait.c | |
| parent | m68k: Include proper header file (diff) | |
| download | rtems-21789a2117f7485000e0d88c3f76a6b9d507bb5a.tar.bz2 | |
score: Rename _POSIX_Absolute_timeout_to_ticks()
Rename _POSIX_Absolute_timeout_to_ticks() to
_TOD_Absolute_timeout_to_ticks() and move it to the score directory.
Delete empty <rtems/posix/time.h>.
Diffstat (limited to 'cpukit/posix/src/condtimedwait.c')
| -rw-r--r-- | cpukit/posix/src/condtimedwait.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cpukit/posix/src/condtimedwait.c b/cpukit/posix/src/condtimedwait.c index 191a09fb46..3c978e41b8 100644 --- a/cpukit/posix/src/condtimedwait.c +++ b/cpukit/posix/src/condtimedwait.c @@ -22,9 +22,8 @@ #include <errno.h> #include <rtems/system.h> -#include <rtems/score/watchdog.h> +#include <rtems/score/todimpl.h> #include <rtems/posix/condimpl.h> -#include <rtems/posix/time.h> #include <rtems/posix/muteximpl.h> /* @@ -39,7 +38,7 @@ int pthread_cond_timedwait( { Watchdog_Interval ticks; bool already_timedout; - POSIX_Absolute_timeout_conversion_results_t status; + TOD_Absolute_timeout_conversion_results status; /* * POSIX requires that blocking calls with timeouts that take @@ -51,12 +50,12 @@ int pthread_cond_timedwait( * status into the appropriate error. */ already_timedout = false; - status = _POSIX_Absolute_timeout_to_ticks(abstime, &ticks); - if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID ) + status = _TOD_Absolute_timeout_to_ticks(abstime, &ticks); + if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID ) return EINVAL; - if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST || - status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW ) + if ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST || + status == TOD_ABSOLUTE_TIMEOUT_IS_NOW ) already_timedout = true; return _POSIX_Condition_variables_Wait_support( |