Fix make errors
authorMatt Caswell <matt@openssl.org>
Wed, 14 Jan 2015 21:26:14 +0000 (21:26 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 22 Jan 2015 09:25:13 +0000 (09:25 +0000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
util/ck_errf.pl
util/mkerr.pl

index f13af5c50b4ec80095dbdb82970cdea3cb41bf8f..1a8665ab6a1b45976baeb7287c58be64e91ed1a9 100755 (executable)
@@ -21,7 +21,7 @@ foreach $file (@ARGV)
        $func="";
        while (<IN>)
                {
-               if (!/;$/ && /^([a-zA-Z].*[\s*])?([A-Za-z_0-9]+)\(.*[),]/)
+               if (!/;$/ && /^\**([a-zA-Z].*[\s*])?([A-Za-z_0-9]+)\(.*([),]|$)/)
                        {
                        /^([^()]*(\([^()]*\)[^()]*)*)\(/;
                        $1 =~ /([A-Za-z_0-9]*)$/;
index 5033abad97d9aa10624d325fe4a6eb2b19cc3a72..88388f5325e93d658124c74fe74b0360df10fcfd 100644 (file)
@@ -251,7 +251,7 @@ while (($hdr, $lib) = each %libinc)
 
        if ($gotfile) {
          while(<IN>) {
-               if(/^\#define\s+(\S+)\s+(\S+)/) {
+               if(/^\#\s*define\s+(\S+)\s+(\S+)/) {
                        $name = $1;
                        $code = $2;
                        next if $name =~ /^${lib}err/;