diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 10:41:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 10:41:10 +0100 |
| commit | b41f74438672dd682bc01ae818cb3da654f22c1e (patch) | |
| tree | 07674ef1368a5427a75080528d8cee74234f6b28 /pthreads/pthread_rwlock_timedwrlock.c | |
| parent | aaf21968deb85b635cb6aa6544df233ea5981346 (diff) | |
| download | vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.tar.gz vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.tar.bz2 vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.zip | |
Updated to latest CVS version of pthreads
Diffstat (limited to 'pthreads/pthread_rwlock_timedwrlock.c')
| -rw-r--r-- | pthreads/pthread_rwlock_timedwrlock.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pthreads/pthread_rwlock_timedwrlock.c b/pthreads/pthread_rwlock_timedwrlock.c index 8c111bbb1..7622d97f8 100644 --- a/pthreads/pthread_rwlock_timedwrlock.c +++ b/pthreads/pthread_rwlock_timedwrlock.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 @@ -34,6 +35,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <limits.h> #include "pthread.h" @@ -101,10 +106,10 @@ pthread_rwlock_timedwrlock (pthread_rwlock_t * rwlock, rwl->nCompletedSharedAccessCount = -rwl->nSharedAccessCount; /* - * This routine may be a cancelation point + * This routine may be a cancellation point * according to POSIX 1003.1j section 18.1.2. */ -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth(0) #endif pthread_cleanup_push (ptw32_rwlock_cancelwrwait, (void *) rwl); @@ -119,7 +124,7 @@ pthread_rwlock_timedwrlock (pthread_rwlock_t * rwlock, while (result == 0 && rwl->nCompletedSharedAccessCount < 0); pthread_cleanup_pop ((result != 0) ? 1 : 0); -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth() #endif |