NEW FILE HEADER / COPYRIGHT FORMAT

[senf.git] / Utils / Buffer.hh

diff --git a/Utils/Buffer.hh b/Utils/Buffer.hh
index aa4bba9..c6beafa 100644 (file)
--- a/Utils/Buffer.hh
+++ b/Utils/Buffer.hh
@@ -1,6 +1,8 @@
+// $Id$
+//
 // Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -25,31 +27,11 @@
 #define HH_Buffer_ 1
 
 // Custom includes
+#include "../config.hh"
 
 //#include "Buffer.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
-#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
-#
-#endif
-
 #if defined(SENF_BUFFER_USE_LOCALS)
 
 #   define SENF_SCOPED_BUFFER(type, sym, size)  \
@@ -76,7 +58,7 @@
         either pointer to \a type or array of \a type:
 
         \code
-          #include "Utils/Buffer.hh"
+          #include "../Utils/Buffer.hh"
 
           void foo(std::string const & str)
           {