diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 10:51:09 +0200 |
| commit | 3c0d2312573b81e3067bea610a58b1940c075e05 (patch) | |
| tree | 3f025a27d813374f225957801226aa8ee829a33a /pthreads/sem_timedwait.c | |
| parent | ba033884541714680fd7552ab9d6c8817650f7d8 (diff) | |
| parent | 88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff) | |
| download | vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2 vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/Xfuncproto.h.in
X11/configure.ac
X11/keysymdef.h
freetype/include/freetype/internal/pcftypes.h
freetype/src/cache/ftcbasic.c
freetype/src/cache/ftccmap.c
mesalib/src/glsl/ir.h
mesalib/src/glsl/link_functions.cpp
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/program/prog_optimize.c
mesalib/src/mesa/state_tracker/st_program.c
pthreads/Makefile
Diffstat (limited to 'pthreads/sem_timedwait.c')
| -rw-r--r-- | pthreads/sem_timedwait.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pthreads/sem_timedwait.c b/pthreads/sem_timedwait.c index 52146b478..638431cf1 100644 --- a/pthreads/sem_timedwait.c +++ b/pthreads/sem_timedwait.c @@ -77,7 +77,7 @@ ptw32_sem_timedwait_cleanup (void * args) { /* Indicate we're no longer waiting */ s->value++; -#ifdef NEED_SEM +#if defined(NEED_SEM) if (s->value > 0) { s->leftToUnblock = 0; @@ -177,7 +177,7 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) if (v < 0) { -#ifdef NEED_SEM +#if defined(NEED_SEM) int timedout; #endif sem_timedwait_cleanup_args_t cleanup_args; @@ -185,21 +185,21 @@ sem_timedwait (sem_t * sem, const struct timespec *abstime) cleanup_args.sem = s; cleanup_args.resultPtr = &result; -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1400 #pragma inline_depth(0) #endif /* Must wait */ pthread_cleanup_push(ptw32_sem_timedwait_cleanup, (void *) &cleanup_args); -#ifdef NEED_SEM +#if defined(NEED_SEM) timedout = #endif result = pthreadCancelableTimedWait (s->sem, milliseconds); 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 (!timedout && pthread_mutex_lock (&s->lock) == 0) { |