diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-08-16 14:03:43 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-08-16 14:03:43 +0000 |
| commit | 93a78ac437ba44f493333d7e2a4b0249839ce460 (patch) | |
| tree | be93f2f5a76313d6decc7ccca7623671e23c7974 /nptl/pthread_cond_timedwait.c | |
| parent | 4b4f2771c217d7b038bcfc17c985ba057da554db (diff) | |
| download | glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.tar glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.tar.gz glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.tar.bz2 glibc-93a78ac437ba44f493333d7e2a4b0249839ce460.zip | |
Remove __ASSUME_POSIX_TIMERS.
Diffstat (limited to 'nptl/pthread_cond_timedwait.c')
| -rw-r--r-- | nptl/pthread_cond_timedwait.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/nptl/pthread_cond_timedwait.c b/nptl/pthread_cond_timedwait.c index 9605cd74cc..51a34ba4f2 100644 --- a/nptl/pthread_cond_timedwait.c +++ b/nptl/pthread_cond_timedwait.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003,2004,2007,2010,2011 Free Software Foundation, Inc. +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -113,23 +113,9 @@ __pthread_cond_timedwait (cond, mutex, abstime) (cond->__data.__nwaiters & ((1 << COND_NWAITERS_SHIFT) - 1)), &rt); -# ifndef __ASSUME_POSIX_TIMERS - if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (ret, err), 0)) - { - struct timeval tv; - (void) gettimeofday (&tv, NULL); - - /* Convert the absolute timeout value to a relative timeout. */ - rt.tv_sec = abstime->tv_sec - tv.tv_sec; - rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000; - } - else -# endif - { - /* Convert the absolute timeout value to a relative timeout. */ - rt.tv_sec = abstime->tv_sec - rt.tv_sec; - rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec; - } + /* Convert the absolute timeout value to a relative timeout. */ + rt.tv_sec = abstime->tv_sec - rt.tv_sec; + rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec; #else /* Get the current time. So far we support only one clock. */ struct timeval tv; |