Browse Source

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
maint
Junio C Hamano 9 years ago
parent
commit
c0144452ef
  1. 2
      compat/regex/regcomp.c
  2. 1
      compat/regex/regex.c

2
compat/regex/regcomp.c

@ -18,8 +18,6 @@ @@ -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,

1
compat/regex/regex.c

@ -60,6 +60,7 @@ @@ -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

Loading…
Cancel
Save