X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2Fparse_fixed_setup.hh;h=46adca0c5f25c7e52430d1db04c6f0d310b59c3b;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=a714b9deaa5a5b6f2ac64ae20be331fc2cf89036;hpb=54eed72c506b09ef5b4be0b62fecedfbc0e3f261;p=senf.git

diff --git a/Packets/parse_fixed_setup.hh b/Packets/parse_fixed_setup.hh
index a714b9d..46adca0 100644
--- a/Packets/parse_fixed_setup.hh
+++ b/Packets/parse_fixed_setup.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// 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,37 +23,13 @@
 /** \file
     \brief parse_fixed_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_FIXED_FIELD
-#define SENF_PARSE_FIELD_RO           SENF_PARSER_FIXED_FIELD_RO
-#define SENF_PARSE_FIELD_AFTER        SENF_PARSER_FIXED_FIELD_AFTER
-#define SENF_PARSE_FIELD_AFTER_RO     SENF_PARSER_FIXED_FIELD_AFTER_RO
-#define SENF_PARSE_CUSTOM_FIELD       SENF_PARSER_FIXED_CUSTOM_FIELD
-#define SENF_PARSE_CUSTOM_FIELD_AFTER SENF_PARSER_FIXED_CUSTOM_FIELD_AFTER
-#define SENF_PARSE_BITFIELD           SENF_PARSER_FIXED_BITFIELD
-#define SENF_PARSE_BITFIELD_RO        SENF_PARSER_FIXED_BITFIELD_RO
+#define SENF_PARSER_TYPE fix
 
-#define SENF_PARSER_INHERIT           SENF_PARSER_FIXED_INHERIT_I
-#define SENF_PARSER_FINALIZE          SENF_PARSER_FINALIZE_FIXED
-#define SENF_PARSER_FINALIZE_INHERITED SENF_PARSER_FINALIZE_INHERITED_FIXED
-
-#define SENF_PARSER_SETUP_INCLUDED 1
-
-SENF_FIXED_PARSER_INITIALIZE()
+SENF_PARSER_INITIALIZE()
 
 
 // Local Variables: