Mailing List Archive

Author: ylavic
Date: Thu Mar 14 17:12:17 2024
New Revision: 1916312

URL: http://svn.apache.org/viewvc?rev=1916312&view=rev
Log:
mod_systemd: Axe APR_OPTIONAL_FN redeclarations to avoid compiler warning.

ap_find_systemd_socket() and ap_systemd_listen_fds() are already declared in
"ap_listen.h", so just include them.


Modified:
httpd/httpd/trunk/modules/arch/unix/mod_systemd.c

Modified: httpd/httpd/trunk/modules/arch/unix/mod_systemd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_systemd.c?rev=1916312&r1=1916311&r2=1916312&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_systemd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_systemd.c Thu Mar 14 17:12:17 2024
@@ -18,6 +18,7 @@
#include <stdint.h>
#include <ap_config.h>
#include "ap_mpm.h"
+#include "ap_listen.h"
#include <http_core.h>
#include <httpd.h>
#include <http_log.h>
@@ -34,12 +35,6 @@
#include <unistd.h>
#endif

-APR_DECLARE_OPTIONAL_FN(int,
- ap_find_systemd_socket, (process_rec *, apr_port_t));
-
-APR_DECLARE_OPTIONAL_FN(int,
- ap_systemd_listen_fds, (int));
-
static int systemd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp)
{