Merge remote-tracking branch 'refs/remotes/IOMultiplexer.git/master' into development

[NeonServV5.git] / src / overall.h

diff --git a/src/overall.h b/src/overall.h
index 3f6de8aca4083534054ff015fd1034c99aefd3ae..64ee2cadb67eed9bace5fe758bfb36b4549f43b2 100644 (file)
--- a/src/overall.h
+++ b/src/overall.h
@@ -1,4 +1,4 @@
-/* overall.h - NeonServ v5.4
+/* 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.4"
-#define VERSION_PATCHLEVEL 657
+#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>
@@ -137,7 +139,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{|}~[\\]^-_`"