summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:38 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-06 13:06:38 -0700
commitc0144452efbd4de667c26dacad7dfb9fbca99705 (patch)
tree651c9adc3b63698a46167cd1ae254109c54072c8 /compat
parent8162401fb0ab16addc6e003a93b8d195cce3fad4 (diff)
parentbd8f0055836e7f9c5010d5ed81d3b20a835e44c8 (diff)
downloadgit-c0144452efbd4de667c26dacad7dfb9fbca99705.tar.gz
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
Diffstat (limited to 'compat')
-rw-r--r--compat/regex/regcomp.c2
-rw-r--r--compat/regex/regex.c1
2 files changed, 1 insertions, 2 deletions
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