From f0f371e137158a86c4bc846a1492cd47f95a0291 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 6 Jan 2017 12:49:39 -0800 Subject: [PATCH] dfa: fix 'return' typo Problem reported by Nelson H. F. Beebe. * lib/dfa.c (merge): Fix typo that Sun compilers rejected. --- ChangeLog | 6 ++++++ lib/dfa.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ebd491f846..d3dad042a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-01-06 Paul Eggert + + dfa: fix 'return' typo + Problem reported by Nelson H. F. Beebe. + * lib/dfa.c (merge): Fix typo that Sun compilers rejected. + 2017-01-05 Pádraig Brady parse-datetime: fix generated paths for coverage files diff --git a/lib/dfa.c b/lib/dfa.c index 4f656657b7..8276db160a 100644 --- a/lib/dfa.c +++ b/lib/dfa.c @@ -2086,7 +2086,7 @@ merge_constrained (position_set const *s1, position_set const *s2, static void merge (position_set const *s1, position_set const *s2, position_set *m) { - return merge_constrained (s1, s2, -1, m); + merge_constrained (s1, s2, -1, m); } /* Delete a position from a set. Return the nonzero constraint of the -- 2.39.5