clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
Joe Watkins 2017-01-06 16:34:20 +00:00
parent bb513f15e1
commit 598bb2cad8
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -3099,7 +3099,6 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL], [
])
<<<<<<< HEAD
dnl PHP_CHECK_BUILTIN_SMULL_OVERFLOW
AC_DEFUN([PHP_CHECK_BUILTIN_SMULL_OVERFLOW], [
AC_MSG_CHECKING([for __builtin_smull_overflow])