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/tests/semaphore4.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/tests/semaphore4.c')
| -rw-r--r-- | pthreads/tests/semaphore4.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pthreads/tests/semaphore4.c b/pthreads/tests/semaphore4.c index 37613ac39..3a28c7b50 100644 --- a/pthreads/tests/semaphore4.c +++ b/pthreads/tests/semaphore4.c @@ -94,7 +94,6 @@ main() assert(sem_init(&s, PTHREAD_PROCESS_PRIVATE, 0) == 0); assert(sem_getvalue(&s, &value) == 0); -// printf("Value = %d\n", value); fflush(stdout); assert(value == 0); for (i = 1; i <= MAX_COUNT; i++) @@ -104,28 +103,23 @@ main() sched_yield(); assert(sem_getvalue(&s, &value) == 0); } while (value != -i); -// printf("Value = %d\n", value); fflush(stdout); assert(-value == i); } assert(sem_getvalue(&s, &value) == 0); assert(-value == MAX_COUNT); -//printf("value = %d\n", -value); fflush(stdout); assert(pthread_cancel(t[50]) == 0); { - int result; - assert(pthread_join(t[50], (void **) &result) == 0); -// printf("result = %d\n", result); fflush(stdout); + void* result; + assert(pthread_join(t[50], &result) == 0); } assert(sem_getvalue(&s, &value) == 0); -//printf("value = %d\n", -value); fflush(stdout); assert(-value == (MAX_COUNT - 1)); for (i = MAX_COUNT - 2; i >= 0; i--) { assert(sem_post(&s) == 0); assert(sem_getvalue(&s, &value) == 0); -// printf("Value = %d\n", value); fflush(stdout); assert(-value == i); } |