From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sun, 9 Dec 2001 23:45:57 +0000 (+0000)
Subject: h2ph updates from OpenBSD 3.0.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=99ed927b9cb7383662696a50cb0d8e2aa25d47d7;p=p5sagit%2Fp5-mst-13.2.git

h2ph updates from OpenBSD 3.0.

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

diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 901f0bb..7903996 100644
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -338,7 +338,7 @@ sub expr {
 	# Eliminate typedefs
 	/\(([\w\s]+)[\*\s]*\)\s*[\w\(]/ && do {
 	    foreach (split /\s+/, $1) {  # Make sure all the words are types,
-		last unless ($isatype{$_} or $_ eq 'struct');
+		last unless ($isatype{$_} or $_ eq 'struct' or $_ eq 'union');
 	    }
 	    s/\([\w\s]+[\*\s]*\)// && next;      # then eliminate them.
 	};
@@ -361,7 +361,7 @@ sub expr {
 	};
 	s/^([_a-zA-Z]\w*)//	&& do {
 	    my $id = $1;
-	    if ($id eq 'struct') {
+	    if ($id eq 'struct' || $id eq 'union') {
 		s/^\s+(\w+)//;
 		$id .= ' ' . $1;
 		$isatype{$id} = 1;