Properly export ap_listen_* functions.

* server/listen.c: Add AP_DECLARE as appropriate.
* include/ap_listen.h: Add AP_DECLARE as appropriate.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106843 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_listen.h b/include/ap_listen.h
index 8b0741b9f1ebe10a09be8715fe1cedb60ce55a79..84157ce593fd473551c311fc5a65279839f9e901 100644 (file)
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -63,7 +63,7 @@ AP_DECLARE_DATA extern ap_listen_rec *ap_listeners;
 /**
  * Setup all of the defaults for the listener list
  */
-void ap_listen_pre_config(void);
+AP_DECLARE(void) ap_listen_pre_config(void);
 #if !defined(SPMT_OS2_MPM)
 /**
  * Loop through the global ap_listen_rec list and create all of the required
@@ -73,7 +73,7 @@ void ap_listen_pre_config(void);
  * @warning This function is not available to Windows platforms, or the
  * Prefork or SPMT_OS2 MPMs.
  */ 
-int ap_setup_listeners(server_rec *s);
+AP_DECLARE(int) ap_setup_listeners(server_rec *s);
 #endif
 /* Split into two #if's to make the exports scripts easier.
  */
@@ -87,7 +87,7 @@ int ap_setup_listeners(server_rec *s);
  * @warning This function is only available to Windows platforms, or the
  * Prefork or SPMT_OS2 MPMs.
  */
-int ap_listen_open(process_rec *process, apr_port_t port);
+AP_DECLARE(int) ap_listen_open(process_rec *process, apr_port_t port);
 #endif
 
 /* Although these functions are exported from libmain, they are not really
@@ -97,9 +97,9 @@ int ap_listen_open(process_rec *process, apr_port_t port);
  * LISTEN_COMMANDS in their command_rec table so that these functions are
  * called.
  */ 
-const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg);
-const char *ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips);
-const char *ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
+AP_DECLARE(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg);
+AP_DECLARE(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips);
+AP_DECLARE(const char *) ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
                                    const char *arg);
 
 #define LISTEN_COMMANDS        \

diff --git a/server/listen.c b/server/listen.c
index 13a53ac7fdbb350a4649a19d7c7293f04a5a8267..7d9128bdadf892ac0ce31288e1b09080da4fba15 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -28,7 +28,7 @@
 #include "mpm.h"
 #include "mpm_common.h"
 
-ap_listen_rec *ap_listeners = NULL;
+AP_DECLARE_DATA ap_listen_rec *ap_listeners = NULL;
 
 static ap_listen_rec *old_listeners;
 static int ap_listenbacklog;
@@ -288,7 +288,7 @@ static const char *alloc_listener(process_rec *process, char *addr, apr_port_t p
     return NULL;
 }
 
-static int ap_listen_open(apr_pool_t *pool, apr_port_t port)
+AP_DECLARE(int) ap_listen_open(apr_pool_t *pool, apr_port_t port)
 {
     ap_listen_rec *lr;
     ap_listen_rec *next;
@@ -418,7 +418,7 @@ static int ap_listen_open(apr_pool_t *pool, apr_port_t port)
     return num_open ? 0 : -1;
 }
 
-int ap_setup_listeners(server_rec *s)
+AP_DECLARE(int) ap_setup_listeners(server_rec *s)
 {
     ap_listen_rec *lr;
     int num_listeners = 0;
@@ -434,7 +434,7 @@ int ap_setup_listeners(server_rec *s)
     return num_listeners;
 }
 
-void ap_listen_pre_config(void)
+AP_DECLARE(void) ap_listen_pre_config(void)
 {
     old_listeners = ap_listeners;
     ap_listeners = NULL;
@@ -442,7 +442,7 @@ void ap_listen_pre_config(void)
 }
 
 
-const char *ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips)
+AP_DECLARE(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips)
 {
     char *host, *scope_id;
     apr_port_t port;
@@ -474,7 +474,7 @@ const char *ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips)
     return alloc_listener(cmd->server->process, host, port);
 }
 
-const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg)
+AP_DECLARE(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg)
 {
     int b;
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -492,7 +492,7 @@ const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg)
     return NULL;
 }
 
-const char *ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
+AP_DECLARE(const char *) ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
                                     const char *arg)
 {
     int s = atoi(arg);