diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 10:33:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 10:33:05 +0200 |
| commit | 88101146f2ec7d53ffb793e365f05097ffd35fd3 (patch) | |
| tree | db77eef572a00c62c8d9485c4786f682e20a2fd0 /pthreads/sem_wait.c | |
| parent | 772373ccc8da2b2019555228f4972cc0c5a885a4 (diff) | |
| download | vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.gz vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.tar.bz2 vcxsrv-88101146f2ec7d53ffb793e365f05097ffd35fd3.zip | |
cvs version of pthreads
Diffstat (limited to 'pthreads/sem_wait.c')
| -rw-r--r-- | pthreads/sem_wait.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pthreads/sem_wait.c b/pthreads/sem_wait.c index d39d2b4b6..50c11d808 100644 --- a/pthreads/sem_wait.c +++ b/pthreads/sem_wait.c @@ -63,7 +63,7 @@ ptw32_sem_wait_cleanup(void * sem) if (*((sem_t *)sem) != NULL && !(WaitForSingleObject(s->sem, 0) == WAIT_OBJECT_0)) { ++s->value; -#ifdef NEED_SEM +#if defined(NEED_SEM) if (s->value > 0) { s->leftToUnblock = 0; @@ -139,7 +139,7 @@ sem_wait (sem_t * sem) if (v < 0) { -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1400 #pragma inline_depth(0) #endif /* Must wait */ @@ -147,11 +147,11 @@ sem_wait (sem_t * sem) result = pthreadCancelableWait (s->sem); /* Cleanup if we're canceled or on any other error */ pthread_cleanup_pop(result); -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1400 #pragma inline_depth() #endif } -#ifdef NEED_SEM +#if defined(NEED_SEM) if (!result && pthread_mutex_lock (&s->lock) == 0) { |