diff options
Diffstat (limited to 'pthreads/sem_timedwait.c')
| -rw-r--r-- | pthreads/sem_timedwait.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pthreads/sem_timedwait.c b/pthreads/sem_timedwait.c index 638431cf1..36dedf575 100644 --- a/pthreads/sem_timedwait.c +++ b/pthreads/sem_timedwait.c @@ -15,10 +15,11 @@ * * Pthreads-win32 - POSIX Threads Library for Win32 * Copyright(C) 1998 John E. Bossom - * Copyright(C) 1999,2005 Pthreads-win32 contributors - * - * Contact Email: rpj@callisto.canberra.edu.au - * + * Copyright(C) 1999,2012 Pthreads-win32 contributors + * + * Homepage1: http://sourceware.org/pthreads-win32/ + * Homepage2: http://sourceforge.net/projects/pthreads4w/ + * * The current list of contributors is contained * in the file CONTRIBUTORS included with the source * code distribution. The list can also be seen at the @@ -41,6 +42,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "pthread.h" #include "semaphore.h" #include "implement.h" @@ -168,7 +173,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) if (*sem == NULL) { (void) pthread_mutex_unlock (&s->lock); - errno = EINVAL; + PTW32_SET_ERRNO(EINVAL); return -1; } @@ -185,7 +190,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) cleanup_args.sem = s; cleanup_args.resultPtr = &result; -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth(0) #endif /* Must wait */ @@ -195,7 +200,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) #endif result = pthreadCancelableTimedWait (s->sem, milliseconds); pthread_cleanup_pop(result); -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth() #endif @@ -206,7 +211,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) if (*sem == NULL) { (void) pthread_mutex_unlock (&s->lock); - errno = EINVAL; + PTW32_SET_ERRNO(EINVAL); return -1; } @@ -228,7 +233,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) if (result != 0) { - errno = result; + PTW32_SET_ERRNO(result); return -1; } |