From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Sun, 13 Jun 2004 17:54:47 +0000 (+0000)
Subject: More h2ph voodoo.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5fff27bd847e99d376dc14e8b7fb6503335c47f9;p=p5sagit%2Fp5-mst-13.2.git

More h2ph voodoo.

p4raw-id: //depot/perl@22933
---

diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 2e1c499..c6a39c9 100644
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -302,14 +302,17 @@ while (defined (my $file = next_file())) {
 			       "unless defined(\&$enum_name);\n");
 		}
 	    }
-	} elsif (/^(?:__extension__\s+)?(?:extern|static)\s+(?:__)?inline(?:__)?\s+/) { # { for vi
+	} elsif (/^(?:__extension__\s+)?(?:extern|static)\s+(?:__)?inline(?:__)?\s+/
+	    and !/;\s*$/ and !/{\s*}\s*$/)
+	{ # { for vi
 	    # This is a hack to parse the inline functions in the glibc headers.
-	    # Warning: massive kludge ahead. We suppose inline functions are mainly
-	    # constructed like macros.
+	    # Warning: massive kludge ahead. We suppose inline functions
+	    # are mainly constructed like macros.
 	    while (1) {
 		last unless defined ($next = next_line($file));
 		chomp $next;
-		undef $_, last if $next =~ /__THROW\s*;/;
+		undef $_, last if $next =~ /__THROW\s*;/
+			       or $next =~ /^(__extension__|extern|static)\b/;
 		$_ .= " $next";
 		print OUT "# $next\n" if $opt_D;
 		last if $next =~ /^}|^{.*}\s*$/;