X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.h;h=5002bcd6d0b3391e061be8a7b1ca649f7d9ca64e;hb=f90d21daf31f8d69e24406678be696afa8cae962;hp=8a1b1e4b8719728f3afd634d73b167a9da52937b;hpb=c575e458c6257e75b97884847143b20965a5dfda;p=NeonServV5.git

diff --git a/src/main.h b/src/main.h
index 8a1b1e4..5002bcd 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,5 @@
-/* main.h - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* main.h - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,14 +16,12 @@
  */
 #ifndef _main_h
 #define _main_h
+#include "../config.h"
 
-#define NEONSERV_VERSION "5.2"
-#define VERSION_PATCHLEVEL 414
-
-#ifndef BOTWAR_ALERT_CHAN
-#define BOTWAR_ALERT_CHAN NULL
-#endif
+#define NEONSERV_VERSION "5.3"
+#define VERSION_PATCHLEVEL 543
 
+#include <features.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,17 +29,36 @@
 #ifdef WIN32
 #include <windows.h>
 #include <winsock2.h>
+#include <malloc.h>
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/wait.h>
 #endif
 #include <unistd.h>
 #include <stdarg.h>
 #include <sys/time.h>
 #include <time.h>
+#ifdef HAVE_THREADS
+#include <pthread.h>
+#include <sys/syscall.h>
+#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_mutex_init(&var, &mutex_attr); \
+}
+#define SYNCHRONIZE(var) pthread_mutex_lock(&var)
+#define DESYNCHRONIZE(var) pthread_mutex_unlock(&var)
+#else
+#define THREAD_MUTEX_INIT(var)
+#define SYNCHRONIZE(var)
+#define DESYNCHRONIZE(var)
+#endif
 
 #if __GNUC__
 #define PRINTF_LIKE(M,N) __attribute__((format (printf, M, N)))
@@ -104,8 +121,18 @@
 #define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
 
 extern time_t start_time;
+extern int statistics_enabled;
+#ifdef HAVE_THREADS
+extern int running_threads;
+#endif
 
 int stricmp (const char *s1, const char *s2);
 int stricmplen (const char *s1, const char *s2, int len);
 
+void restart_bot(int do_hard_restart);
+void stop_bot();
+void reload_config();
+
+void statistics_update();
+
 #endif
\ No newline at end of file