aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/mutex1r.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
commit3c0d2312573b81e3067bea610a58b1940c075e05 (patch)
tree3f025a27d813374f225957801226aa8ee829a33a /pthreads/tests/mutex1r.c
parentba033884541714680fd7552ab9d6c8817650f7d8 (diff)
parent88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff)
downloadvcxsrv-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/mutex1r.c')
-rw-r--r--pthreads/tests/mutex1r.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/pthreads/tests/mutex1r.c b/pthreads/tests/mutex1r.c
index 0666dec0d..15083f27a 100644
--- a/pthreads/tests/mutex1r.c
+++ b/pthreads/tests/mutex1r.c
@@ -54,6 +54,8 @@ main()
{
assert(pthread_mutexattr_init(&mxAttr) == 0);
+ BEGIN_MUTEX_STALLED_ROBUST(mxAttr)
+
assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_RECURSIVE) == 0);
assert(mutex == NULL);
@@ -70,5 +72,7 @@ main()
assert(mutex == NULL);
+ END_MUTEX_STALLED_ROBUST(mxAttr)
+
return 0;
}