From 589681516f3580ceca8d0131faa78783f2ec18a0 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Fri, 11 Feb 2011 10:07:24 -0600 Subject: [PATCH] Strip volatile keywords in field parse. * gio/gio-api.raw: reparse * parser/gapi2xml.pl: strip volatile keyword from field declarations before parsing them. --- gio/gio-api.raw | 14 +++++++------- parser/gapi2xml.pl | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gio/gio-api.raw b/gio/gio-api.raw index 56075dc6d..d54776e80 100644 --- a/gio/gio-api.raw +++ b/gio/gio-api.raw @@ -12025,7 +12025,7 @@ - + @@ -12046,7 +12046,7 @@ - + @@ -12065,7 +12065,7 @@ - + @@ -12113,7 +12113,7 @@ - + @@ -12129,7 +12129,7 @@ - + @@ -12164,7 +12164,7 @@ - + @@ -12180,7 +12180,7 @@ - + diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 1f91af824..412286a85 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -610,6 +610,7 @@ sub addFieldElems } next if ($field !~ /\S/); $field =~ s/GSEAL\s*\((.*)\)/\1/g; + $field =~ s/\bvolatile\s+//g; $field =~ s/\s+(\*+)/\1 /g; $field =~ s/(const\s+)?(\w+)\*\s+const\*/const \2\*/g; $field =~ s/(\w+)\s+const\s*\*/const \1\*/g;