X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2Fconfig.hh;h=1e1ac5fb028856db5314f35728c6a969ad6c134d;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=e31bc20caa1804f562449945be466e857ad8d26d;hpb=9aa490ed0078870217b4986174e5e7d1953da58f;p=senf.git

diff --git a/senf/config.hh b/senf/config.hh
index e31bc20..1e1ac5f 100644
--- a/senf/config.hh
+++ b/senf/config.hh
@@ -19,17 +19,17 @@
 // along with this program; if not, write to the
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
+
 /** \file
     \brief config public header */
- 
+
 #ifndef HH_config_
 #define HH_config_ 1
- 
+
 // Custom includes
 #include <boost/cstdint.hpp>
 #include <limits.h>
- 
+
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -39,43 +39,33 @@ namespace config {
 
 }}
 
+# include "autoconf.hh"
 # 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
@@ -90,21 +80,26 @@ namespace config {
 #     define SENF_DEBUG_BACKTRACE_NUMCALLERS 64
 # endif
 #
-# ifndef SENF_CONSOLE_MAX_COMMAND_ARITY 
+# ifndef SENF_CONSOLE_MAX_COMMAND_ARITY
 #     define SENF_CONSOLE_MAX_COMMAND_ARITY 6
 # endif
-# 
+#
 # ifndef PHOENIX_LIMIT
 #     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
- 
+#
+# ifndef SENF_PACKET_ANNOTATION_SLOTSIZE
+#     define SENF_PACKET_ANNOTATION_SLOTSIZE 16
+# endif
+#
+
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
- 
+
 
 // Local Variables:
 // mode: c++
@@ -115,4 +110,3 @@ namespace config {
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u all_tests"
 // End:
-