Skip to content

Commit bb513f1

Browse files
committed
Merge branch 'PHP-7.1'
* PHP-7.1: Test request47456.phpt for PR 1303
2 parents 8e447ea + c50f61b commit bb513f1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

acinclude.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3099,6 +3099,7 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL], [
30993099
31003100
])
31013101

3102+
<<<<<<< HEAD
31023103
dnl PHP_CHECK_BUILTIN_SMULL_OVERFLOW
31033104
AC_DEFUN([PHP_CHECK_BUILTIN_SMULL_OVERFLOW], [
31043105
AC_MSG_CHECKING([for __builtin_smull_overflow])

0 commit comments

Comments
 (0)