From: Aleš Křenek Date: Fri, 22 Aug 2008 14:22:46 +0000 (+0000) Subject: avoid multiple definitions of _UNDEFINED enum values X-Git-Tag: myproxy-config-R_2_0_2_1~66 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=55c0cefb5718d9eaf82faef212a5688a32e3a3fc;p=jra1mw.git avoid multiple definitions of _UNDEFINED enum values --- diff --git a/org.glite.lb.common/interface/events.h.T b/org.glite.lb.common/interface/events.h.T index 86f9de5..2014bb8 100644 --- a/org.glite.lb.common/interface/events.h.T +++ b/org.glite.lb.common/interface/events.h.T @@ -203,6 +203,7 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} } my $f = selectField $event $_; if ($f->{codes}) { my $fn = ucfirst($f->{name}); + my $fu = uc $fn; my $c = "$t${fn}"; # new code my $enum = "enum edg_wll\_$c"; # new enum name @@ -215,7 +216,14 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} } $enum \{ }; my $null = $f->{null} ? $f->{null} : 0; - gen $indent."EDG_WLL_${tu}UNDEFINED = $null,\t/**< undefined code */ \n"; + gen $indent."EDG_WLL_${tu}${fu}_UNDEFINED = $null,\t/**< undefined code */ \n"; + unless ($main::defined_undefs{$tu}) { + gen qq{/* backward compatibility */ +!\#define EDG_WLL_${tu}UNDEFINED EDG_WLL_${tu}${fu}_UNDEFINED +! +}; + $main::defined_undefs{$tu} = 1; + } for (@{$f->{codes}}) { gen $indent."EDG_WLL_$tu$_->{name},\t/**< $_->{comment} */ \n"; }