From 271ae3eb2b142b3ecabe01ebdcc2d29acdd9bc1a Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 10 Jul 2018 14:28:28 +0200 Subject: [PATCH] Fix #76574: use of undeclared identifiers INT_MAX and LONG_MAX As of Oniguruma 6.4.0 is required, so we have to add a check for this header file to set the respective macro. --- NEWS | 1 + ext/mbstring/config.m4 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index aa001592c45..70df174c985 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ PHP NEWS log_limit, log_buffering and decorate_workers_output. (Jakub Zelenka) - mbstring: + . Fixed bug #76574 (use of undeclared identifiers INT_MAX and LONG_MAX). (cmb) . Fixed bug #76594 (Bus Error due to unaligned access in zend_ini.c OnUpdateLong). (cmb, Nikita) diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index d1054928b76..4bd1b8fe06d 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -96,7 +96,7 @@ int main() { return foo(10, "", 3.14); } ]) ]) - AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h]) + AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h limits.h]) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(long, 4)