Convert InspIRCd::SetSignals to a static function.

[user/henk/code/inspircd.git] / include / compat.h

diff --git a/include/compat.h b/include/compat.h
index fa75cd75434b228d8d96ed350acc509d7142cc51..7a95e90505d3e371941966f7e9ccf75074b2dc4b 100644 (file)
--- a/include/compat.h
+++ b/include/compat.h
@@ -27,10 +27,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
 
 /**
@@ -70,24 +76,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.
@@ -106,9 +94,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 __attribute__ ((visibility ("default")))
 # define CoreExport __attribute__ ((visibility ("default")))
+# include <unistd.h>
+# include "threadengines/threadengine_pthread.h"
 #endif