Skip to content

Commit 3de5a70

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents b7437a5 + 3e2711f commit 3de5a70

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmake/ext/posix/config.cmake.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,8 @@
4949
/* Define to 1 if you have the 'setsid' function. */
5050
#cmakedefine HAVE_SETSID 1
5151

52+
/* Define to 1 if you have a working 'ttyname_r' function. */
53+
#cmakedefine HAVE_TTYNAME_R 1
54+
5255
/* Define to 1 if 'domainname' is a member of 'struct utsname'. */
5356
#cmakedefine HAVE_STRUCT_UTSNAME_DOMAINNAME 1

cmake/main/php_config.cmake.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,6 @@
561561
/* Define to 1 if you have the <tmmintrin.h> header file. */
562562
#cmakedefine HAVE_TMMINTRIN_H 1
563563

564-
/* Define to 1 if you have a working 'ttyname_r' function. */
565-
#cmakedefine HAVE_TTYNAME_R 1
566-
567564
/* Define to 1 if you have the 'tzset' function. */
568565
#cmakedefine HAVE_TZSET 1
569566

0 commit comments

Comments
 (0)