X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2Fconfig.hh;h=4e26793db4f2a46adbc231a39a1402c78be1156a;hb=838c26a04f4ff76694a67c7726ad4b6b626982e7;hp=31c1b458d2eeca26110c2b0ad561ad91ae717a67;hpb=463db052ea9d1c292bfd40301d0dc4963411485e;p=senf.git

diff --git a/senf/config.hh b/senf/config.hh
index 31c1b45..4e26793 100644
--- a/senf/config.hh
+++ b/senf/config.hh
@@ -30,7 +30,7 @@
 #include <boost/cstdint.hpp>
 #include <limits.h>
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace config {
@@ -43,40 +43,29 @@ namespace config {
 # include "local_config.hh"
 #
 # ifndef SENF_ABSOLUTE_INCLUDE_PATH
-#     define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) <senf/senf_relative_include_file_path>
+#     define SENF_ABSOLUTE_INCLUDE_PATH(senf_relative_include_file_path) \
+          <senf/senf_relative_include_file_path>
 # endif
 #
 # ifndef SENF_copy_n
-#     include <algorithm>
-#     if defined(__GNUC__) && ! defined(_STLP_ALGORITHM) && (__GNUC__>=4 || (__GNUC__==3 && __GNUC_MINOR__>=4))
+#     ifdef HAVE_GNUCXX_COPYN
 #         include <ext/algorithm>
-#         define SENF_copy_n __gnu_cxx::copy_n
-#     else
-#         define SENF_copy_n std::copy_n
+          namespace senf { namespace config { using __gnu_cxx::copy_n; }}
 #     endif
-# endif
+#     ifdef HAVE_STD_COPYN
+#         include <algorithm>
+          namespace senf { namespace config { using std::copy_n; }}
+#     endif
+#  endif
 #
 # ifndef SENF_MPL_RV_ALIGNMENT
 #     define SENF_MPL_RV_ALIGNMENT 16
 # endif
 #
-# if !defined(SENF_BUFFER_USE_LOCALS) && !defined(SENF_BUFFER_USE_ALLOCA) && !defined(SENF_BUFFER_USE_NEW)
-#
-#     if defined(__GNUC__)
-#         define SENF_BUFFER_USE_LOCALS 1
-#
-#     // Add other compilers here ...
-#
-#     // dynamic arrays are part of C99. Which is NOT part of C++
-#     // but lets try nonetheless ...
-#     elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#         define SENF_BUFFER_USE_LOCALS 1
-#     endif
-#
-#     if !defined(SENF_BUFFER_USE_LOCALS) && !defined(SENF_BUFFER_USE_ALLOCA)
-#         define SENF_BUFFER_USE_NEW 1
-#     endif
-#
+# if    !defined(SENF_BUFFER_USE_LOCALS) \
+     && !defined(SENF_BUFFER_USE_ALLOCA) \
+     && !defined(SENF_BUFFER_USE_NEW)
+#     define SENF_BUFFER_USE_NEW 1
 # endif
 #
 # ifndef SENF_SENFLOG_LIMIT
@@ -99,11 +88,20 @@ namespace config {
 #     define PHOENIX_LIMIT 6
 # endif
 #
-# if __GLIBC__>=2 && __GLIBC_MINOR__>=8
-#     define HAVE_TIMERFD 1
+# ifndef SENF_PACKET_ANNOTATION_SLOTS
+#     define SENF_PACKET_ANNOTATION_SLOTS 8
 # endif
-
-///////////////////////////////hh.e////////////////////////////////////////
+#
+# ifndef SENF_PACKET_ANNOTATION_SLOTSIZE
+#     define SENF_PACKET_ANNOTATION_SLOTSIZE 16
+# endif
+#
+# ifdef SENF_DEBUG
+#     ifdef HAVE_EXECINFO_H
+#          define SENF_BACKTRACE
+#     endif
+# endif
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif