projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved inviteme all to an own command called invitemeall
[NeonServV5.git]
/
src
/
overall.h
diff --git
a/src/overall.h
b/src/overall.h
index d84c1d2272bb3a0bda92b92332a9f8ca2e1d56fb..caf062de7161598fa76e3ccc485ab790160c22a8 100644
(file)
--- 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
* 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 _overall_h
#include "../config.h"
-#define NEONSERV_VERSION "5.
5
"
-#define VERSION_PATCHLEVEL 7
07
+#define NEONSERV_VERSION "5.
6
"
+#define VERSION_PATCHLEVEL 7
36
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.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) { \