Declare the ap_set_listen* functions with AP_DECLARE_NONSTD for Win32 support.

(I think this is what is needed for Win32, but I'm not quite sure.)

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

diff --git a/include/ap_listen.h b/include/ap_listen.h
index 84157ce593fd473551c311fc5a65279839f9e901..21c52e78c1f842c647fc46fdcbf469684475b1d5 100644 (file)
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -97,9 +97,9 @@ AP_DECLARE(int) ap_listen_open(process_rec *process, apr_port_t port);
  * LISTEN_COMMANDS in their command_rec table so that these functions are
  * called.
  */ 
-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,
+AP_DECLARE_NONSTD(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg);
+AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips);
+AP_DECLARE_NONSTD(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 7d9128bdadf892ac0ce31288e1b09080da4fba15..1167e0b2fcd61c5c6fe177ca5a1bc998d4203b7e 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -442,7 +442,8 @@ AP_DECLARE(void) ap_listen_pre_config(void)
 }
 
 
-AP_DECLARE(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips)
+AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+                                                const char *ips)
 {
     char *host, *scope_id;
     apr_port_t port;
@@ -474,7 +475,9 @@ AP_DECLARE(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, const char
     return alloc_listener(cmd->server->process, host, port);
 }
 
-AP_DECLARE(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg)
+AP_DECLARE_NONSTD(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,8 +495,9 @@ AP_DECLARE(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const
     return NULL;
 }
 
-AP_DECLARE(const char *) ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
-                                    const char *arg)
+AP_DECLARE_NONSTD(const char *) ap_set_send_buffer_size(cmd_parms *cmd,
+                                                        void *dummy,
+                                                        const char *arg)
 {
     int s = atoi(arg);
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);