From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:06:38 +0000 (-0700)
Subject: Merge branch 'rj/compat-regex-size-max-fix' into maint
X-Git-Tag: v2.9.1~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c0144452efbd4de667c26dacad7dfb9fbca99705?hp=8162401fb0ab16addc6e003a93b8d195cce3fad4

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

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 fba5986399..d8bde06f1a 100644
--- 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 6aaae00327..5cb23e5d59 100644
--- 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