Skip to content

Commit bf139e9

Browse files
authored
Remove unused defined CPP macros in fpm SAPI (#14740)
* Remove unused defined CPP macros in fpm SAPI - PHP_FPM_SYSTEMD - PHP_FPM_USER - PHP_FPM_GROUP * [skip ci] Update UPGRADING.INTERNALS
1 parent 9caad37 commit bf139e9

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

UPGRADING.INTERNALS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
136136
- Symbol HAVE_WAITPID has been removed.
137137
- Symbol HAVE_LIBPQ has been removed.
138138
- Symbols HAVE_LIBRT and HAVE_TIMER_CREATE removed.
139+
- Symbols PHP_FPM_SYSTEMD, PHP_FPM_USER, and PHP_FPM_GROUP removed.
139140
- M4 macro PHP_DEFINE (atomic includes) removed (use AC_DEFINE and config.h).
140141
- M4 macro PHP_WITH_SHARED has been removed (use PHP_ARG_WITH).
141142
- M4 macro PHP_STRUCT_FLOCK has been removed (use AC_CHECK_TYPES).

sapi/fpm/config.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ if test "$PHP_FPM" != "no"; then
554554
fi
555555

556556
AC_SUBST([php_fpm_systemd])
557-
AC_DEFINE_UNQUOTED(PHP_FPM_SYSTEMD, "$php_fpm_systemd", [fpm systemd service type])
558557

559558
if test -z "$PHP_FPM_USER" || test "$PHP_FPM_USER" = "yes" || test "$PHP_FPM_USER" = "no"; then
560559
php_fpm_user="nobody"
@@ -577,9 +576,6 @@ if test "$PHP_FPM" != "no"; then
577576
php_fpm_prefix=`eval echo $prefix`
578577
AC_SUBST([php_fpm_prefix])
579578

580-
AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
581-
AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
582-
583579
PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
584580
PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
585581
PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)

0 commit comments

Comments
 (0)