NEW FILE HEADER / COPYRIGHT FORMAT

[senf.git] / Packets / parse_setup.hh

diff --git a/Packets/parse_setup.hh b/Packets/parse_setup.hh
index b097271..cb4cbe8 100644 (file)
--- a/Packets/parse_setup.hh
+++ b/Packets/parse_setup.hh
@@ -1,8 +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
@@ -23,35 +23,11 @@
 /** \file
     \brief parse_setup public header */
 
-#ifdef SENF_PARSER_SETUP_INCLUDED
-#  undef SENF_PARSE_FIELD
-#  undef SENF_PARSE_FIELD_RO
-#  undef SENF_PARSE_FIELD_AFTER
-#  undef SENF_PARSE_FIELD_AFTER_RO
-#  undef SENF_PARSE_CUSTOM_FIELD
-#  undef SENF_PARSE_CUSTOM_FIELD_AFTER
-#  undef SENF_PARSE_BITFIELD
-#  undef SENF_PARSE_BITFIELD_RO
-#  undef SENF_PARSER_INHERIT
-#  undef SENF_PARSER_FINALIZE
-#  undef SENF_PARSER_FINALIZE_INHERITED
-#  undef SENF_PARSER_SETUP_INCLUDED
+#ifdef SENF_PARSER_TYPE
+#  undef SENF_PARSER_TYPE
 #endif
 
-#define SENF_PARSE_FIELD              SENF_PARSER_FIELD
-#define SENF_PARSE_FIELD_RO           SENF_PARSER_FIELD_RO
-#define SENF_PARSE_FIELD_AFTER        SENF_PARSER_FIELD_AFTER
-#define SENF_PARSE_FIELD_AFTER_RO     SENF_PARSER_FIELD_AFTER_RO
-#define SENF_PARSE_CUSTOM_FIELD       SENF_PARSER_CUSTOM_FIELD
-#define SENF_PARSE_CUSTOM_FIELD_AFTER SENF_PARSER_CUSTOM_FIELD_AFTER
-#define SENF_PARSE_BITFIELD           SENF_PARSER_BITFIELD
-#define SENF_PARSE_BITFIELD_RO        SENF_PARSER_BITFIELD_RO
-
-#define SENF_PARSER_INHERIT           SENF_PARSER_INHERIT_I
-#define SENF_PARSER_FINALIZE          SENF_PARSER_FINALIZE_DYNAMIC
-#define SENF_PARSER_FINALIZE_INHERITED SENF_PARSER_FINALIZE_INHERITED_DYNAMIC
-
-#define SENF_PARSER_SETUP_INCLUDED 1
+#define SENF_PARSER_TYPE var
 
 SENF_PARSER_INITIALIZE()