archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify port_create Autoconf check (#13529)

Browse source 
Similar simplification as e72f0c887b.
This commit is contained in:
Peter Kokot 2024-03-02 00:16:19 +01:00 • committed by GitHub
parent 42a4e50513
commit ffc6f192a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sapi/fpm/config.m4
View file

@ -327,27 +327,6 @@ AC_DEFUN([AC_FPM_KQUEUE],
])
])
AC_DEFUN([AC_FPM_PORT],
[
AC_MSG_CHECKING([for port framework])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <port.h>
]], [[
int port;
port = port_create();
if (port < 0) {
return 1;
}
]])], [
AC_DEFINE([HAVE_PORT], 1, [do we have port framework?])
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
])
AC_DEFUN([AC_FPM_DEVPOLL],
[
AC_MSG_CHECKING([for /dev/poll])
@ -443,7 +422,6 @@ if test "$PHP_FPM" != "no"; then
AC_FPM_BUILTIN_ATOMIC
AC_FPM_LQ
AC_FPM_KQUEUE
AC_FPM_PORT
AC_FPM_DEVPOLL
AC_FPM_EPOLL
AC_FPM_SELECT
@ -452,6 +430,7 @@ if test "$PHP_FPM" != "no"; then
AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])])
AC_CHECK_HEADER([sys/times.h], [AC_CHECK_FUNCS([times])])
AC_CHECK_HEADER([port.h], [AC_CHECK_FUNCS([port_create])])
PHP_ARG_WITH([fpm-user],,
[AS_HELP_STRING([[--with-fpm-user[=USER]]],

12
sapi/fpm/fpm/events/port.c
View file

@ -19,7 +19,7 @@
#include "../fpm.h"
#include "../zlog.h"
#ifdef HAVE_PORT
#ifdef HAVE_PORT_CREATE
#include <port.h>
#include <poll.h>
@ -45,19 +45,19 @@ port_event_t *events = NULL;
int nevents = 0;
static int pfd = -1;
#endif /* HAVE_PORT */
#endif /* HAVE_PORT_CREATE */
struct fpm_event_module_s *fpm_event_port_module(void) /* {{{ */
{
#ifdef HAVE_PORT
#ifdef HAVE_PORT_CREATE
return &port_module;
#else
return NULL;
#endif /* HAVE_PORT */
#endif /* HAVE_PORT_CREATE */
}
/* }}} */
#ifdef HAVE_PORT
#ifdef HAVE_PORT_CREATE
/*
* Init the module
@ -196,4 +196,4 @@ static int fpm_event_port_remove(struct fpm_event_s *ev) /* {{{ */
}
/* }}} */
#endif /* HAVE_PORT */
#endif /* HAVE_PORT_CREATE */