X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Foverall.h;h=caf062de7161598fa76e3ccc485ab790160c22a8;hb=4812835346f724fcea86e78f741cc6c72c86b676;hp=d84c1d2272bb3a0bda92b92332a9f8ca2e1d56fb;hpb=70b7d70a96523b78cd470c6fe2ab78beb345d607;p=NeonServV5.git diff --git a/src/overall.h b/src/overall.h index d84c1d2..caf062d 100644 --- a/src/overall.h +++ b/src/overall.h @@ -1,4 +1,4 @@ -/* overall.h - NeonServ v5.5 +/* overall.h - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -19,8 +19,8 @@ #define _overall_h #include "../config.h" -#define NEONSERV_VERSION "5.5" -#define VERSION_PATCHLEVEL 707 +#define NEONSERV_VERSION "5.6" +#define VERSION_PATCHLEVEL 736 #include #include @@ -31,7 +31,9 @@ #include #include #else +#ifdef HAVE_FEATURES_H #include +#endif #include #include #include @@ -58,10 +60,15 @@ #else #define pthread_self_tid() pthread_self() #endif +#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 THREAD_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 THREAD_MUTEX_INIT_TYPE(var, type) { \