Skip to content

Commit ffc6f19

Browse files
authored
Simplify port_create Autoconf check (#13529)
Similar simplification as e72f0c8.
1 parent 42a4e50 commit ffc6f19

File tree

2 files changed

+7
-28
lines changed

2 files changed

+7
-28
lines changed

sapi/fpm/config.m4

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -327,27 +327,6 @@ AC_DEFUN([AC_FPM_KQUEUE],
327327
])
328328
])
329329

330-
AC_DEFUN([AC_FPM_PORT],
331-
[
332-
AC_MSG_CHECKING([for port framework])
333-
334-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
335-
#include <port.h>
336-
]], [[
337-
int port;
338-
339-
port = port_create();
340-
if (port < 0) {
341-
return 1;
342-
}
343-
]])], [
344-
AC_DEFINE([HAVE_PORT], 1, [do we have port framework?])
345-
AC_MSG_RESULT([yes])
346-
], [
347-
AC_MSG_RESULT([no])
348-
])
349-
])
350-
351330
AC_DEFUN([AC_FPM_DEVPOLL],
352331
[
353332
AC_MSG_CHECKING([for /dev/poll])
@@ -443,7 +422,6 @@ if test "$PHP_FPM" != "no"; then
443422
AC_FPM_BUILTIN_ATOMIC
444423
AC_FPM_LQ
445424
AC_FPM_KQUEUE
446-
AC_FPM_PORT
447425
AC_FPM_DEVPOLL
448426
AC_FPM_EPOLL
449427
AC_FPM_SELECT
@@ -452,6 +430,7 @@ if test "$PHP_FPM" != "no"; then
452430

453431
AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])])
454432
AC_CHECK_HEADER([sys/times.h], [AC_CHECK_FUNCS([times])])
433+
AC_CHECK_HEADER([port.h], [AC_CHECK_FUNCS([port_create])])
455434

456435
PHP_ARG_WITH([fpm-user],,
457436
[AS_HELP_STRING([[--with-fpm-user[=USER]]],

sapi/fpm/fpm/events/port.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "../fpm.h"
2020
#include "../zlog.h"
2121

22-
#ifdef HAVE_PORT
22+
#ifdef HAVE_PORT_CREATE
2323

2424
#include <port.h>
2525
#include <poll.h>
@@ -45,19 +45,19 @@ port_event_t *events = NULL;
4545
int nevents = 0;
4646
static int pfd = -1;
4747

48-
#endif /* HAVE_PORT */
48+
#endif /* HAVE_PORT_CREATE */
4949

5050
struct fpm_event_module_s *fpm_event_port_module(void) /* {{{ */
5151
{
52-
#ifdef HAVE_PORT
52+
#ifdef HAVE_PORT_CREATE
5353
return &port_module;
5454
#else
5555
return NULL;
56-
#endif /* HAVE_PORT */
56+
#endif /* HAVE_PORT_CREATE */
5757
}
5858
/* }}} */
5959

60-
#ifdef HAVE_PORT
60+
#ifdef HAVE_PORT_CREATE
6161

6262
/*
6363
* Init the module
@@ -196,4 +196,4 @@ static int fpm_event_port_remove(struct fpm_event_s *ev) /* {{{ */
196196
}
197197
/* }}} */
198198

199-
#endif /* HAVE_PORT */
199+
#endif /* HAVE_PORT_CREATE */

0 commit comments

Comments
 (0)