httpd-cvs mailing list archives

Author: jerenkrantz
Date: Sun Nov 28 11:37:41 2004
New Revision: 106843

URL: http://svn.apache.org/viewcvs?view=rev&rev=106843
Log:
Properly export ap_listen_* functions.

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

Modified:
   httpd/httpd/trunk/include/ap_listen.h
   httpd/httpd/trunk/server/listen.c

Modified: httpd/httpd/trunk/include/ap_listen.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/ap_listen.h?view=diff&rev=106843&p1=httpd/httpd/trunk/include/ap_listen.h&r1=106842&p2=httpd/httpd/trunk/include/ap_listen.h&r2=106843
==============================================================================
--- httpd/httpd/trunk/include/ap_listen.h	(original)
+++ httpd/httpd/trunk/include/ap_listen.h	Sun Nov 28 11:37:41 2004
@@ -63,7 +63,7 @@
 /**
  * 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 @@
  * @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 @@
  * @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 @@
  * 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	\

Modified: httpd/httpd/trunk/server/listen.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/listen.c?view=diff&rev=106843&p1=httpd/httpd/trunk/server/listen.c&r1=106842&p2=httpd/httpd/trunk/server/listen.c&r2=106843
==============================================================================
--- httpd/httpd/trunk/server/listen.c	(original)
+++ httpd/httpd/trunk/server/listen.c	Sun Nov 28 11:37:41 2004
@@ -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 @@
     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 @@
     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 @@
     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 @@
 }
 
 
-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 @@
     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 @@
     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);