From: pk910 Date: Sat, 22 Sep 2012 04:54:22 +0000 (+0200) Subject: Merge remote-tracking branch 'remotes/IOMultiplexer.git/master' into development X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=7289d420ddc81d9975ed6d55dfdfd70dff2b2d48;hp=1471e99b8b975135cf4f66c0e497d4a5ded7ed77;p=NeonServV5.git Merge remote-tracking branch 'remotes/IOMultiplexer.git/master' into development --- diff --git a/src/IOEngine.h b/src/IOEngine.h index f64078e..5f68240 100644 --- a/src/IOEngine.h +++ b/src/IOEngine.h @@ -20,10 +20,15 @@ #ifdef HAVE_PTHREAD_H #include +#ifdef PTHREAD_MUTEX_RECURSIVE_NP +#define PTHREAD_MUTEX_RECURSIVE_VAL PTHREAD_MUTEX_RECURSIVE_NP +#else +#define PTHREAD_MUTEX_RECURSIVE_VAL PTHREAD_MUTEX_RECURSIVE +#endif #define IOTHREAD_MUTEX_INIT(var) { \ pthread_mutexattr_t mutex_attr; \ pthread_mutexattr_init(&mutex_attr);\ - pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);\ + pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_VAL);\ pthread_mutex_init(&var, &mutex_attr); \ } #define IOSYNCHRONIZE(var) pthread_mutex_lock(&var)