X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcompat.h;h=47fda1e23564682c45236377178b2684d29efde2;hb=9efce7bd23eff8ea956b834d6c69b35df1519fe3;hp=1cdad06c20a76ba4f9178549f52df4b9bbdfe76e;hpb=a15d4c391bfd4ffed1e8552636be821784df0ac4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/compat.h b/include/compat.h
index 1cdad06c2..47fda1e23 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -1,9 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2013-2014, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -27,10 +26,16 @@
  */
 #if defined _LIBCPP_VERSION || defined _WIN32
 # define TR1NS std
+# include <array>
+# include <functional>
 # include <unordered_map>
+# include <type_traits>
 #else
 # define TR1NS std::tr1
+# include <tr1/array>
+# include <tr1/functional>
 # include <tr1/unordered_map>
+# include <tr1/type_traits>
 #endif
 
 /**
@@ -41,7 +46,6 @@
 #if defined __clang__ || defined __GNUC__
 # define CUSTOM_PRINTF(stringpos, firstpos) __attribute__((format(printf, stringpos, firstpos)))
 #else
-# pragma message ("Warning! CUSTOM_PRINTF() does not work on your compiler!")
 # define CUSTOM_PRINTF(stringpos, firstpos)
 #endif
 
@@ -71,24 +75,6 @@
 # define CXX11_OVERRIDE
 #endif
 
-/**
- * These macros enable the detection of the C++11 variadic templates in
- * compilers which support them.
- */
-#if __cplusplus >= 201103L
-# define HAS_CXX11_VARIADIC_TEMPLATES
-#elif defined __clang__
-# if __has_feature(cxx_variadic_templates)
-#  define HAS_CXX11_VARIADIC_TEMPLATES
-# endif
-#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# if defined __GXX_EXPERIMENTAL_CXX0X__
-#  define HAS_CXX11_VARIADIC_TEMPLATES
-# endif
-#elif _MSC_FULL_VER >= 170051025
-# define HAS_CXX11_VARIADIC_TEMPLATES
-#endif
-
 /**
  * This macro allows methods to be marked as deprecated. To use this, wrap the
  * method declaration in the header file with the macro.
@@ -98,7 +84,6 @@
 #elif defined _MSC_VER
 # define DEPRECATED_METHOD(function) __declspec(deprecated) function
 #else
-# pragma message ("Warning! DEPRECATED_METHOD() does not work on your compiler!")
 # define DEPRECATED_METHOD(function) function
 #endif
 
@@ -108,9 +93,11 @@
  */
 #if defined _WIN32
 # include "inspircd_win32wrapper.h"
+# include "threadengines/threadengine_win32.h"
 #else
-# include <unistd.h>
 # define ENTRYPOINT int main(int argc, char** argv)
-# define DllExport
-# define CoreExport
+# define DllExport __attribute__ ((visibility ("default")))
+# define CoreExport __attribute__ ((visibility ("default")))
+# include <unistd.h>
+# include "threadengines/threadengine_pthread.h"
 #endif