Fix make errors

(cherry picked from commit 628fcba5b784c0cf47d39b184eb044e4ff616546)

diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index f13af5c50b4ec80095dbdb82970cdea3cb41bf8f..1a8665ab6a1b45976baeb7287c58be64e91ed1a9 100755 (executable)
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -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]*)$/;

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 38f93bfda0a4fb98c4ee2dea3ac28316dda3d6f9..2438e8eb0c31d276bcf8cc0eefb85921096f9e84 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -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/;