X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2Fconfig.hh;h=1e1ac5fb028856db5314f35728c6a969ad6c134d;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=1c6122fced330308076c03c079d5ca00f770ff83;hpb=1813074b60d1e0a3c5d53be44d4c664cce3cd2cd;p=senf.git

diff --git a/senf/config.hh b/senf/config.hh
index 1c6122f..1e1ac5f 100644
--- a/senf/config.hh
+++ b/senf/config.hh
@@ -43,17 +43,18 @@ 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
 #     ifdef HAVE_GNUCXX_COPYN
 #         include <ext/algorithm>
-#         define SENF_copy_n __gnu_cxx::copy_n
+          namespace senf { namespace config { using __gnu_cxx::copy_n; }}
 #     endif
 #     ifdef HAVE_STD_COPYN
 #         include <algorithm>
-#         define SENF_copy_n std::copy_n
+          namespace senf { namespace config { using std::copy_n; }}
 #     endif
 #  endif
 #
@@ -61,7 +62,9 @@ namespace config {
 #     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(SENF_BUFFER_USE_LOCALS) \
+     && !defined(SENF_BUFFER_USE_ALLOCA) \
+     && !defined(SENF_BUFFER_USE_NEW)
 #     define SENF_BUFFER_USE_NEW 1
 # endif
 #
@@ -89,8 +92,10 @@ namespace config {
 #     define SENF_PACKET_ANNOTATION_SLOTS 8
 # endif
 #
-//# define SENF_PACKET_NO_COMPLEX_ANNOTATIONS
-
+# ifndef SENF_PACKET_ANNOTATION_SLOTSIZE
+#     define SENF_PACKET_ANNOTATION_SLOTSIZE 16
+# endif
+#
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif