diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:38 -0700 |
| commit | c0144452efbd4de667c26dacad7dfb9fbca99705 (patch) | |
| tree | 651c9adc3b63698a46167cd1ae254109c54072c8 | |
| parent | Merge branch 'vs/prompt-avoid-unset-variable' into maint (diff) | |
| parent | regex: fix a SIZE_MAX macro redefinition warning (diff) | |
| download | tgif-c0144452efbd4de667c26dacad7dfb9fbca99705.tar.xz | |
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
| -rw-r--r-- | compat/regex/regcomp.c | 2 | ||||
| -rw-r--r-- | compat/regex/regex.c | 1 |
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 |