aboutsummaryrefslogtreecommitdiff
path: root/pthreads/pthread_cond_wait.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
committermarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
commit8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch)
tree158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/pthread_cond_wait.c
parent4a165ef2f762a4ce9155f2a3626692326bda616d (diff)
parentb41f74438672dd682bc01ae818cb3da654f22c1e (diff)
downloadvcxsrv-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/pthread_cond_wait.c')
-rw-r--r--pthreads/pthread_cond_wait.c30
1 files changed, 17 insertions, 13 deletions
diff --git a/pthreads/pthread_cond_wait.c b/pthreads/pthread_cond_wait.c
index 359219ae9..0dd695cbb 100644
--- a/pthreads/pthread_cond_wait.c
+++ b/pthreads/pthread_cond_wait.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
@@ -255,9 +256,12 @@
* return result;
* }
* -------------------------------------------------------------
- *
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "pthread.h"
#include "implement.h"
@@ -303,7 +307,7 @@ ptw32_cond_wait_cleanup (void *args)
/* Use the non-cancellable version of sem_wait() */
if (ptw32_semwait (&(cv->semBlockLock)) != 0)
{
- *resultPtr = errno;
+ *resultPtr = PTW32_GET_ERRNO();
/*
* This is a fatal error for this CV,
* so we deliberately don't unlock
@@ -314,7 +318,7 @@ ptw32_cond_wait_cleanup (void *args)
cv->nWaitersBlocked -= cv->nWaitersGone;
if (sem_post (&(cv->semBlockLock)) != 0)
{
- *resultPtr = errno;
+ *resultPtr = PTW32_GET_ERRNO();
/*
* This is a fatal error for this CV,
* so we deliberately don't unlock
@@ -335,7 +339,7 @@ ptw32_cond_wait_cleanup (void *args)
{
if (sem_post (&(cv->semBlockLock)) != 0)
{
- *resultPtr = errno;
+ *resultPtr = PTW32_GET_ERRNO();
return;
}
}
@@ -384,14 +388,14 @@ ptw32_cond_timedwait (pthread_cond_t * cond,
/* Thread can be cancelled in sem_wait() but this is OK */
if (sem_wait (&(cv->semBlockLock)) != 0)
{
- return errno;
+ return PTW32_GET_ERRNO();
}
++(cv->nWaitersBlocked);
if (sem_post (&(cv->semBlockLock)) != 0)
{
- return errno;
+ return PTW32_GET_ERRNO();
}
/*
@@ -401,7 +405,7 @@ ptw32_cond_timedwait (pthread_cond_t * cond,
cleanup_args.cv = cv;
cleanup_args.resultPtr = &result;
-#if defined(_MSC_VER) && _MSC_VER < 1400
+#if defined(PTW32_CONFIG_MSVC7)
#pragma inline_depth(0)
#endif
pthread_cleanup_push (ptw32_cond_wait_cleanup, (void *) &cleanup_args);
@@ -430,7 +434,7 @@ ptw32_cond_timedwait (pthread_cond_t * cond,
*/
if (sem_timedwait (&(cv->semBlockQueue), abstime) != 0)
{
- result = errno;
+ result = PTW32_GET_ERRNO();
}
}
@@ -438,7 +442,7 @@ ptw32_cond_timedwait (pthread_cond_t * cond,
* Always cleanup
*/
pthread_cleanup_pop (1);
-#if defined(_MSC_VER) && _MSC_VER < 1400
+#if defined(PTW32_CONFIG_MSVC7)
#pragma inline_depth()
#endif