X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Foverall.h;h=caf062de7161598fa76e3ccc485ab790160c22a8;hb=47821a9eac31a40a1ed8c9c53553ac45e44ca8f7;hp=8f167e960993dfb498966f2cfd09608c6ad0831e;hpb=706e48b1e666054030c491d864f740071e390038;p=NeonServV5.git

diff --git a/src/overall.h b/src/overall.h
index 8f167e9..caf062d 100644
--- a/src/overall.h
+++ b/src/overall.h
@@ -1,4 +1,4 @@
-/* overall.h - NeonServ v5.3
+/* 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.3"
-#define VERSION_PATCHLEVEL 543
+#define NEONSERV_VERSION "5.6"
+#define VERSION_PATCHLEVEL 736
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,7 +31,9 @@
 #include <winsock2.h>
 #include <malloc.h>
 #else
+#ifdef HAVE_FEATURES_H
 #include <features.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -39,12 +41,18 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/wait.h>
+#include <errno.h>
 #endif
 #include <unistd.h>
 #include <getopt.h>
 #include <stdarg.h>
 #include <sys/time.h>
 #include <time.h>
+#include <signal.h>
+#ifdef SYNCHRONIZE
+//some winnt machines do already have a SYNCHRONIZE macro defined...
+#undef SYNCHRONIZE
+#endif
 #ifdef HAVE_THREADS
 #include <pthread.h>
 #ifdef WIN32
@@ -52,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) { \
@@ -131,7 +144,7 @@
 #define BOTWAR_DETECTION_TIME 7
 #define BOTWAR_DETECTION_EVENTS 6
 #define REWHO_TIMEOUT   10 /* wait 10 seconds before WHO an unauthed user again */
-#define TICKS_PER_SECOND 10
+#define CLEAR_CACHE_INTERVAL 10
 
 //valid nick chars
 #define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"