Add redefinition guard to menu-generated typedefs

2019-09-06 10:14:39 +02:00
parent 2a0df61974
commit 623539c3e8
1 changed files with 5 additions and 2 deletions
@@ -59,14 +59,17 @@ sub equals {
 sub toDeclaration {
    my $this = shift;
    my $name = $this->name;
+    my $macro_name = "${name}_NUM_CHOICES";
    my @choices = map {
        sprintf "    %-31s /* %s */", @{$_}[0], escapeCcomment(@{$_}[1]);
    } $this->choices;
    my $num = scalar @choices;
-    return "typedef enum {\n" .
+    return "#ifndef $macro_name\n" .
+           "typedef enum {\n" .
               join(",\n", @choices) .
           "\n} $name;\n" .
-           "#define ${name}_NUM_CHOICES $num\n\n";
+           "#define $macro_name $num\n" .
+           "#endif\n\n";
 }

 sub toDefinition {