Skip to content

Commit 66a33db

Browse files
Freakydevnexen
authored andcommitted
Fix GH-12273 - configure __builtin_cpu_init() check
__builtin_cpu_init() is documented as having a void return type. It happens to return int on gcc, but is void on clang. Close GH-122274
1 parent d9e72bc commit 66a33db

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

NEWS

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ PHP NEWS
99
warning). (Girgias)
1010
. Fixed bug GH-12215 (Module entry being overwritten causes type errors in
1111
ext/dom). (nielsdos)
12-
13-
- Core:
1412
. Fixed bug GH-12207 (memory leak when class using trait with doc block).
1513
(rioderelfte)
14+
. Fixed bug GH-12273 (__builtin_cpu_init check). (Freaky)
1615

1716
- Filter:
1817
. Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)

build/php.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CPU_INIT], [
27132713
AC_MSG_CHECKING([for __builtin_cpu_init])
27142714
27152715
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[
2716-
return __builtin_cpu_init()? 1 : 0;
2716+
__builtin_cpu_init();
27172717
]])], [
27182718
have_builtin_cpu_init=1
27192719
AC_MSG_RESULT([yes])

0 commit comments

Comments
 (0)