X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.h;h=879f46c5c70852be87521c10f2d1e7fda5082ea7;hb=55831bf424312a6908ca07a904f288fba0919a9a;hp=51986150719b5914edb794ed0d7c5850c234f026;hpb=aea92ef126cc0fe4433fa04805c06947f92e96d6;p=NeonServV5.git diff --git a/src/main.h b/src/main.h index 5198615..879f46c 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 @@ -18,12 +18,8 @@ #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 #include @@ -32,6 +28,7 @@ #ifdef WIN32 #include #include +#include #else #include #include @@ -45,6 +42,21 @@ #include #include #include +#ifdef HAVE_THREADS +#define THREAD_MUTEX_INIT(var) { \ + pthread_mutexattr_t mutex_attr; \ + pthread_mutexattr_init(&mutex_attr);\ + pthread_mutexattr_setkind_np(&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) +#include +#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)))