Merge branch 'gawk-4.1-stable'

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 04e0103b..36ce11c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2016-04-11         Arnold D. Robbins     <arnold@skeeve.com>
 
+	* regex_internal.c: Replace _GL_ATTRIBUTE_PURE with
+	__attribute__.
+
+2016-04-11         Arnold D. Robbins     <arnold@skeeve.com>
+
 	* regexec.c: Stamp out last remaining use of __attribute.
 	* regcomp.c: Undo change of 2016-01-24 when parsing single-byte
 	ranges. Go back to treating them as bytes and not as characters.
diff --git a/regex_internal.c b/regex_internal.c
index f6b2574f..a2d12266 100644
--- a/regex_internal.c
+++ b/regex_internal.c
@@ -840,7 +840,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
 }
 
 static unsigned char
-internal_function _GL_ATTRIBUTE_PURE
+internal_function __attribute__ ((__pure__))
 re_string_peek_byte_case (const re_string_t *pstr, int idx)
 {
   int ch, off;
@@ -1372,7 +1372,7 @@ re_node_set_insert_last (re_node_set *set, int elem)
    return 1 if SET1 and SET2 are equivalent, return 0 otherwise.  */
 
 static int
-internal_function _GL_ATTRIBUTE_PURE
+internal_function __attribute__ ((__pure__))
 re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
 {
   int i;
@@ -1387,7 +1387,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
 /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */
 
 static int
-internal_function _GL_ATTRIBUTE_PURE
+internal_function __attribute__ ((__pure__))
 re_node_set_contains (const re_node_set *set, int elem)
 {
   unsigned int idx, right, mid;