Skip to content

Commit a899483

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Refactor timelib.m4
2 parents aa7fbdf + 0ffa84d commit a899483

File tree

2 files changed

+8
-82
lines changed

2 files changed

+8
-82
lines changed

ext/date/config0.m4

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
dnl config.m4 for date extension
22

3-
sinclude(ext/date/lib/timelib.m4)
4-
sinclude(lib/timelib.m4)
3+
dnl Check for headers needed by timelib
4+
AC_CHECK_HEADERS([ \
5+
strings.h \
6+
io.h
7+
])
8+
9+
dnl Check for strtoll, atoll
10+
AC_CHECK_FUNCS(strtoll atoll)
511

612
PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
713
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c

ext/date/lib/timelib.m4

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)