From d2f8517ad0df0e08d118a38380e401c7cb7fd36d Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 14 Jan 2015 21:26:14 +0000 Subject: [PATCH] Fix make errors Reviewed-by: Tim Hudson --- util/ck_errf.pl | 2 +- util/mkerr.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/util/ck_errf.pl b/util/ck_errf.pl index f13af5c50b..1a8665ab6a 100755 --- a/util/ck_errf.pl +++ b/util/ck_errf.pl @@ -21,7 +21,7 @@ foreach $file (@ARGV) $func=""; while () { - 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 5033abad97..88388f5325 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -251,7 +251,7 @@ while (($hdr, $lib) = each %libinc) if ($gotfile) { while() { - if(/^\#define\s+(\S+)\s+(\S+)/) { + if(/^\#\s*define\s+(\S+)\s+(\S+)/) { $name = $1; $code = $2; next if $name =~ /^${lib}err/; -- 2.25.1