diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
| commit | 8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch) | |
| tree | 158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/sem_wait.c | |
| parent | 4a165ef2f762a4ce9155f2a3626692326bda616d (diff) | |
| parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
| download | vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2 vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated to latest CVS version of pthreads
Conflicts:
pthreads/Makefile
Diffstat (limited to 'pthreads/sem_wait.c')
| -rw-r--r-- | pthreads/sem_wait.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pthreads/sem_wait.c b/pthreads/sem_wait.c index 50c11d808..97b50e9cd 100644 --- a/pthreads/sem_wait.c +++ b/pthreads/sem_wait.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" @@ -130,7 +135,7 @@ sem_wait (sem_t * sem) if (*sem == NULL) { (void) pthread_mutex_unlock (&s->lock); - errno = EINVAL; + PTW32_SET_ERRNO(EINVAL); return -1; } @@ -139,7 +144,7 @@ sem_wait (sem_t * sem) if (v < 0) { -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth(0) #endif /* Must wait */ @@ -147,7 +152,7 @@ sem_wait (sem_t * sem) result = pthreadCancelableWait (s->sem); /* Cleanup if we're canceled or on any other error */ pthread_cleanup_pop(result); -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth() #endif } @@ -158,7 +163,7 @@ sem_wait (sem_t * sem) if (*sem == NULL) { (void) pthread_mutex_unlock (&s->lock); - errno = EINVAL; + PTW32_SET_ERRNO(EINVAL); return -1; } @@ -178,7 +183,7 @@ sem_wait (sem_t * sem) if (result != 0) { - errno = result; + PTW32_SET_ERRNO(result); return -1; } |