Handle nested macros properly when generating export list.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60895 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 0 deletions

diff --git a/helpers/make_export.pl b/helpers/make_export.pl
index 461fab93e..7f2be6931 100755
--- a/helpers/make_export.pl
+++ b/helpers/make_export.pl
@@ -18,6 +18,7 @@ while ($srcfile = shift(@ARGV)) {
     my $line;
     my $count;
     my $found;
+    my @macro_stack;
 
     open (FILE, $srcfile) || die "Can't open $srcfile\n";
 #    print STDERR "Reading \"$srcfile\"\n";
@@ -34,6 +35,7 @@ while ($srcfile = shift(@ARGV)) {
         if (/\#if(def)? (APR_.*)/) {
             $count++;
             $found++;
+            push @macro_stack, $macro;
             $macro = $2;
             $line .= "$macro\n";
             next;
@@ -54,6 +56,7 @@ while ($srcfile = shift(@ARGV)) {
             if ($count > 0) {
                 $count--;
                 $line .= "\/$macro\n";
+                $macro = pop @macro_stack;
             }
             if ($found == $count + 1) {
                 $found--;