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/ptw32_MCS_lock.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/ptw32_MCS_lock.c')
| -rw-r--r-- | pthreads/ptw32_MCS_lock.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pthreads/ptw32_MCS_lock.c b/pthreads/ptw32_MCS_lock.c index d69cf80eb..434e9b85e 100644 --- a/pthreads/ptw32_MCS_lock.c +++ b/pthreads/ptw32_MCS_lock.c @@ -8,10 +8,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 @@ -89,6 +90,10 @@ * } */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "pthread.h" #include "sched.h" #include "implement.h" @@ -114,7 +119,7 @@ ptw32_mcs_flag_set (HANDLE * flag) } /* - * ptw32_mcs_flag_set -- wait for notification from another. + * ptw32_mcs_flag_wait -- wait for notification from another. * * Store an event handle in the flag and wait on it if the flag has not been * set, and proceed without creating an event otherwise. @@ -122,7 +127,7 @@ ptw32_mcs_flag_set (HANDLE * flag) INLINE void ptw32_mcs_flag_wait (HANDLE * flag) { - if ((PTW32_INTERLOCKED_LONG)0 == + if ((PTW32_INTERLOCKED_SIZE)0 == PTW32_INTERLOCKED_EXCHANGE_ADD_SIZE((PTW32_INTERLOCKED_SIZEPTR)flag, (PTW32_INTERLOCKED_SIZE)0)) /* MBR fence */ { |