Skip to content

Commit 9603199

Browse files
authored
Remove HAVE_SYSCONF check (#13474)
The sysconf can be assumed to be present on current systems, when checking for the _SC_CLK_TCK symbol.
1 parent d299518 commit 9603199

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

sapi/fpm/config.m4

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -337,18 +337,6 @@ AC_DEFUN([AC_FPM_LQ],
337337
fi
338338
])
339339

340-
AC_DEFUN([AC_FPM_SYSCONF],
341-
[
342-
AC_MSG_CHECKING([for sysconf])
343-
344-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[sysconf(_SC_CLK_TCK);]])],[
345-
AC_DEFINE([HAVE_SYSCONF], 1, [do we have sysconf?])
346-
AC_MSG_RESULT([yes])
347-
], [
348-
AC_MSG_RESULT([no])
349-
])
350-
])
351-
352340
AC_DEFUN([AC_FPM_TIMES],
353341
[
354342
AC_MSG_CHECKING([for times])
@@ -499,7 +487,6 @@ if test "$PHP_FPM" != "no"; then
499487
AC_FPM_TRACE
500488
AC_FPM_BUILTIN_ATOMIC
501489
AC_FPM_LQ
502-
AC_FPM_SYSCONF
503490
AC_FPM_TIMES
504491
AC_FPM_KQUEUE
505492
AC_FPM_PORT

sapi/fpm/fpm/fpm_scoreboard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ int fpm_scoreboard_init_main(void)
2626
struct fpm_worker_pool_s *wp;
2727

2828
#ifdef HAVE_TIMES
29-
#if (defined(HAVE_SYSCONF) && defined(_SC_CLK_TCK))
29+
#ifdef _SC_CLK_TCK
3030
fpm_scoreboard_tick = sysconf(_SC_CLK_TCK);
3131
#else /* _SC_CLK_TCK */
3232
#ifdef HZ

0 commit comments

Comments
 (0)