Merge branch 'rj/compat-regex-size-max-fix'

A compilation fix.

* rj/compat-regex-size-max-fix:
regex: fix a SIZE_MAX macro redefinition warning

diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index fba5986399ed20174d37c39bf6d243bcbfddd3a7..d8bde06f1a3dbdc0af02ef6d63f8e18d39989dc3 100644 (file)
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -18,8 +18,6 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  */
 
-#include <stdint.h>
-
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
                                          size_t length, reg_syntax_t syntax);
 static void re_compile_fastmap_iter (regex_t *bufp,

diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index 6aaae003274e268f274df4b76e02609d5f27e457..5cb23e5d5912ac40473643fff0393ac01284df41 100644 (file)
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -60,6 +60,7 @@
    GNU regex allows.  Include it before <regex.h>, which correctly
    #undefs RE_DUP_MAX and sets it to the right value.  */
 #include <limits.h>
+#include <stdint.h>
 
 #ifdef GAWK
 #undef alloca