projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed undefined PTHREAD_MUTEX_RECURSIVE_NP (OSX has PTHREAD_MUTEX_RECURSIVE instead)
[NeonServV5.git]
/
src
/
overall.h
diff --git
a/src/overall.h
b/src/overall.h
index cee57955cd4779a5ac8456523ca43d5e01f4d5f8..caf062de7161598fa76e3ccc485ab790160c22a8 100644
(file)
--- a/
src/overall.h
+++ b/
src/overall.h
@@
-31,7
+31,9
@@
#include <winsock2.h>
#include <malloc.h>
#else
#include <winsock2.h>
#include <malloc.h>
#else
+#ifdef HAVE_FEATURES_H
#include <features.h>
#include <features.h>
+#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@
-58,10
+60,15
@@
#else
#define pthread_self_tid() pthread_self()
#endif
#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);\
#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) { \
pthread_mutex_init(&var, &mutex_attr); \
}
#define THREAD_MUTEX_INIT_TYPE(var, type) { \