diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-17 12:45:43 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-17 12:47:06 +0200 |
| commit | 356b586ec19f4ccc7bbaf8876e040cd8708c51ad (patch) | |
| tree | f14beed15c5ceca5c5ef20c1f953673db8fde544 | |
| parent | 05c8a0771ddf97ef33fa9bdcfbca29625abb3042 (diff) | |
| parent | 48198e4c257825ab89ee027bff5a93fc2cd59601 (diff) | |
| download | php-git-356b586ec19f4ccc7bbaf8876e040cd8708c51ad.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/zip/config.m4 | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -52,6 +52,9 @@ PHP NEWS - XML: . Fixed bug #72085 (SEGV on unknown address zif_xml_parse). (cmb) +- ZIP: + . Fixed bug #68302 (impossible to compile php with zip support). (cmb) + ?? ??? 2016 PHP 7.0.10 - Core: diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 81f47df556..bb653c2068 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -156,6 +156,9 @@ AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([long]) AC_CHECK_SIZEOF([long long]) AC_CHECK_SIZEOF([off_t]) +if test "$ac_cv_sizeof_off_t" = "0" ; then + AC_MSG_ERROR(off_t undefined; check your library configuration) +fi AC_CHECK_SIZEOF([size_t]) AC_PATH_PROG([TOUCH], [touch]) |