From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 7 Dec 2011 10:26:29 +0000 (+0100)
Subject: Porting/expand-macro.pl needs to avoid "macro redefined" errors.
X-Git-Tag: accepted/trunk/20130322.191538~1849
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae2e176f7be6c85a6339a59bda00ae2f36d09397;p=platform%2Fupstream%2Fperl.git

Porting/expand-macro.pl needs to avoid "macro redefined" errors.

In the C code that Porting/expand-macro.pl generates, it #includes the
header containing the macro, to ensure that the macro definition is seen.
This was skipped for perl.h and EXTERN.h, which it always automatically
includes. However, perl.h includes embed.h and embedvar.h and then undefines
and redefines macros in them. Hence if either header is included (again) the
compiler warns about macro redefinitions. Hence ensure that neither is
included a second time.
---

diff --git a/Porting/expand-macro.pl b/Porting/expand-macro.pl
index 6b33f74..f422a44 100755
--- a/Porting/expand-macro.pl
+++ b/Porting/expand-macro.pl
@@ -62,7 +62,9 @@ open my $out, '>', $trysource or die "Can't open $trysource: $!";
 
 my $sentinel = "$macro expands to";
 
-my %done_header;
+# These two are included from perl.h, and perl.h sometimes redefines their
+# macros. So no need to include them.
+my %done_header = ('embed.h' => 1, 'embedvar.h' => 1);
 
 sub do_header {
     my $header = shift;