diff options
author | Richard Levitte <levitte@openssl.org> | 2003-04-03 23:04:48 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2003-04-03 23:04:48 +0000 |
commit | 57544ee2248a2f9d976844fe8eaaf404d4d70f1a (patch) | |
tree | 95d01f329fb3bb7c46b96d5bd32a3b4cabad808d /util | |
parent | 83b23ed967d1847e7393dfb9ff14a2c03b28654b (diff) | |
download | openssl-57544ee2248a2f9d976844fe8eaaf404d4d70f1a.tar.gz |
Counter for GCC attributes.
Diffstat (limited to 'util')
-rwxr-xr-x | util/mkdef.pl | 10 | ||||
-rw-r--r-- | util/mkerr.pl | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index dc5b12b904..4c15a942d2 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -833,14 +833,14 @@ sub do_defs } elsif (/\(\*(\w*(\{[0-9]+\})?)\([^\)]+/) { $s = $1; print STDERR "DEBUG: found ANSI C function $s\n" if $debug; - } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s) { + } elsif (/\w+\W+(\w+)\W*\(\s*\)(\s*__attribute__\(.*\)\s*)?$/s) { # K&R C print STDERR "DEBUG: found K&R C function $s\n" if $debug; next; - } elsif (/\w+\W+\w+(\{[0-9]+\})?\W*\(.*\)$/s) { - while (not /\(\)$/s) { - s/[^\(\)]*\)$/\)/s; - s/\([^\(\)]*\)\)$/\)/s; + } elsif (/\w+\W+\w+(\{[0-9]+\})?\W*\(.*\)(\s*__attribute__\(.*\)\s*)?$/s) { + while (not /\(\)(\s*__attribute__\(.*\)\s*)?$/s) { + s/[^\(\)]*\)(\s*__attribute__\(.*\)\s*)?$/\)/s; + s/\([^\(\)]*\)\)(\s*__attribute__\(.*\)\s*)?$/\)/s; } s/\(void\)//; /(\w+(\{[0-9]+\})?)\W*\(\)/s; diff --git a/util/mkerr.pl b/util/mkerr.pl index f1178602ef..cf34a35ce1 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -128,20 +128,20 @@ while (($hdr, $lib) = each %libinc) s/^[\n\s]*//g; s/[\n\s]*$//g; next if(/typedef\W/); - if (/\(\*(\w*)\([^\)]+/) { + if (/\(\*(\w*)\([^\)]+\)(\s*__attribute__\(.*\)\s*)?$/) { my $name = $1; $name =~ tr/[a-z]/[A-Z]/; $ftrans{$name} = $1; - } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s){ + } elsif (/\w+\W+(\w+)\W*\(\s*\)(\s*__attribute__\(.*\)\s*)?$/s){ # K&R C next ; - } elsif (/\w+\W+\w+\W*\(.*\)$/s) { - while (not /\(\)$/s) { - s/[^\(\)]*\)$/\)/s; - s/\([^\(\)]*\)\)$/\)/s; + } elsif (/\w+\W+\w+\W*\(.*\)(\s*__attribute__\(.*\)\s*)?$/s) { + while (not /\(\)(\s*__attribute__\(.*\)\s*)?$/s) { + s/[^\(\)]*\)(\s*__attribute__\(.*\)\s*)?$/\)/s; + s/\([^\(\)]*\)\)(\s*__attribute__\(.*\)\s*)?$/\)/s; } s/\(void\)//; - /(\w+)\W*\(\)/s; + /(\w+(\{[0-9]+\})?)\W*\(\)/s; my $name = $1; $name =~ tr/[a-z]/[A-Z]/; $ftrans{$name} = $1; |