From b41f74438672dd682bc01ae818cb3da654f22c1e Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 13 Feb 2013 10:41:10 +0100 Subject: Updated to latest CVS version of pthreads --- pthreads/pthread_cond_destroy.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'pthreads/pthread_cond_destroy.c') diff --git a/pthreads/pthread_cond_destroy.c b/pthreads/pthread_cond_destroy.c index 40d4a0896..12e76330d 100644 --- a/pthreads/pthread_cond_destroy.c +++ b/pthreads/pthread_cond_destroy.c @@ -9,10 +9,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 @@ -35,6 +36,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include "pthread.h" #include "implement.h" @@ -138,7 +143,7 @@ pthread_cond_destroy (pthread_cond_t * cond) */ if (ptw32_semwait (&(cv->semBlockLock)) != 0) /* Non-cancelable */ { - result = errno; + result = PTW32_GET_ERRNO(); } else { @@ -166,7 +171,7 @@ pthread_cond_destroy (pthread_cond_t * cond) { if (sem_post (&(cv->semBlockLock)) != 0) { - result = errno; + result = PTW32_GET_ERRNO(); } result1 = pthread_mutex_unlock (&(cv->mtxUnblockLock)); result2 = EBUSY; @@ -180,11 +185,11 @@ pthread_cond_destroy (pthread_cond_t * cond) if (sem_destroy (&(cv->semBlockLock)) != 0) { - result = errno; + result = PTW32_GET_ERRNO(); } if (sem_destroy (&(cv->semBlockQueue)) != 0) { - result1 = errno; + result1 = PTW32_GET_ERRNO(); } if ((result2 = pthread_mutex_unlock (&(cv->mtxUnblockLock))) == 0) { -- cgit v1.2.3