From 623539c3e8be539f8dc2a1dfa65b97768f72cac1 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 6 Sep 2019 10:14:39 +0200
Subject: [PATCH] Add redefinition guard to menu-generated typedefs

---
 src/tools/DBD/Menu.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tools/DBD/Menu.pm b/src/tools/DBD/Menu.pm
index 9c93c6d50..959536eaa 100644
--- a/src/tools/DBD/Menu.pm
+++ b/src/tools/DBD/Menu.pm
@@ -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 {