Skip to content

Commit c014445

Browse files
committed
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
2 parents 8162401 + bd8f005 commit c014445

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

compat/regex/regcomp.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
1919
02110-1301 USA. */
2020

21-
#include <stdint.h>
22-
2321
static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
2422
size_t length, reg_syntax_t syntax);
2523
static void re_compile_fastmap_iter (regex_t *bufp,

compat/regex/regex.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
GNU regex allows. Include it before <regex.h>, which correctly
6161
#undefs RE_DUP_MAX and sets it to the right value. */
6262
#include <limits.h>
63+
#include <stdint.h>
6364

6465
#ifdef GAWK
6566
#undef alloca

0 commit comments

Comments
 (0)