diff --git a/ChangeLog b/ChangeLog index af7d4c241..db475395c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-06-20 Mike Kestner + + * parser/gapi2xml.pl : fix const foo * const * fields/params. + [Fixes #75266] + 2005-06-17 Mike Kestner * Makefile.include : add included apis as deps on the generation diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 8d1c5f4ae..8fc5aa4bf 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -503,7 +503,7 @@ sub addFieldElems } next if ($field !~ /\S/); $field =~ s/\s+(\*+)/\1 /g; - $field =~ s/(\w+)\s+const /const \1 /g; + $field =~ s/(const\s+)?(\w+)\*\s+const\*/const \2\*/g; $field =~ s/const /const\-/g; $field =~ s/struct /struct\-/g; $field =~ s/.*\*\///g; @@ -774,7 +774,7 @@ sub addParamsElem foreach $parm (@params) { $parm_num++; $parm =~ s/\s+(\*+)/\1 /g; - $parm =~ s/(\w+)\s+const /const \1 /g; + $parm =~ s/(const\s+)?(\w+)\*\s+const\*/const \2\*/g; $parm =~ s/(\*+)\s*const\s+/\1 /g; $parm =~ s/const\s+/const-/g; $parm =~ s/unsigned\s+/unsigned-/g;