Merge branch 'master' into feature/cmake

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b0a01eb..8e0fb318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* regexec.c (prune_impossible_nodes): Remove attribute that
+	keeps it from compiling with 32 bit GCC. Who the heck knows
+	why or how. Sigh. Double sigh.
+
 2016-02-20         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h,
diff --git a/regexec.c b/regexec.c
index 84264bb2..7355aad3 100644
--- a/regexec.c
+++ b/regexec.c
@@ -937,7 +937,6 @@ re_search_internal (const regex_t *preg, const char *string, int length,
 }
 
 static reg_errcode_t
-internal_function __attribute_warn_unused_result__
 prune_impossible_nodes (re_match_context_t *mctx)
 {
   const re_dfa_t *const dfa = mctx->dfa;