X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Foverall.h;h=26ff10ebe0d54466b92ea6f6a371ef40116c5488;hp=cee57955cd4779a5ac8456523ca43d5e01f4d5f8;hb=a40e0df080a82db2b1150492a8952cdfe3559185;hpb=fc61be208ca6dbf2fd915591c8dc7e5ef5779891 diff --git a/src/overall.h b/src/overall.h index cee5795..26ff10e 100644 --- a/src/overall.h +++ b/src/overall.h @@ -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) { \ @@ -113,10 +120,6 @@ #include "memoryDebug.h" #endif -#define PID_FILE "neonserv.pid" -#define CONF_FILE "neonserv.conf" -#define LOG_FILE "neonserv.log" - #define SOCKET_SELECT_TIME 1 #define SOCKET_RECONNECT_TIME 20