diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 0e99a29a10b..8035bc395a2 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2015-05-12 Yury Gribov + + * mklog: Ignore preprocessor directives. + 2015-04-22 Jakub Jelinek * gennews (files): Add files for GCC 5. diff --git a/contrib/mklog b/contrib/mklog index f7974a7bd15..455614bfb42 100755 --- a/contrib/mklog +++ b/contrib/mklog @@ -131,7 +131,6 @@ sub is_unified_hunk_start { } # Check if line is a top-level declaration. -# TODO: ignore preprocessor directives except maybe #define ? sub is_top_level { my ($function, $is_context_diff) = (@_); if (is_unified_hunk_start ($function) @@ -143,7 +142,7 @@ sub is_top_level { } else { $function =~ s/^.//; } - return $function && $function !~ /^[\s{]/; + return $function && $function !~ /^[\s{#]/; } # Read contents of .diff file