projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed renameAccount function (merging mode)
[NeonServV5.git]
/
src
/
overall.h
diff --git
a/src/overall.h
b/src/overall.h
index 64ee2cadb67eed9bace5fe758bfb36b4549f43b2..26ff10ebe0d54466b92ea6f6a371ef40116c5488 100644
(file)
--- a/
src/overall.h
+++ b/
src/overall.h
@@
-60,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) { \
@@
-115,10
+120,6
@@
#include "memoryDebug.h"
#endif
#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
#define SOCKET_SELECT_TIME 1
#define SOCKET_RECONNECT_TIME 20