Commit 70964ca4 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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
parent 2c8344f1

include/ap_listen.h

+3 −3
Changes for include/ap_listen.h: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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	\

server/listen.c

+7 −3
Changes for server/listen.c: 7 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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,7 +495,8 @@ 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,

AP_DECLARE_NONSTD(const char *) ap_set_send_buffer_size(cmd_parms *cmd,

                                                        void *dummy,

                                                        const char *arg)

{

    int s = atoi(arg);