From 4fd2e6b032dcc04972c5aab1148ba0f6b6c5c9bd Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 14 Jan 2015 21:26:14 +0000 Subject: 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 344b422c34..24c4ca1ed3 100755 --- a/util/ck_errf.pl +++ b/util/ck_errf.pl @@ -13,7 +13,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 8769e1dbc6..768f0dfda6 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -180,7 +180,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/; -- cgit v1.2.3