httpd.exp and lots of other export files are generated based on the

AP[RU]_DECLARE macros. This commit gets mod_cgid working again as a DSO on
AIX.
However, this brings up the need to look for any functions that are
available as part of the API, and AP[RU]_DECLAREing them, so things don't
blow up in DSOs.

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

diff --git a/include/http_log.h b/include/http_log.h
index 4c99390740a69321e98cefdbb8a251ceecb1fc8c..2e53b85fc3cb5b3740ea06e43d13f415b9c44cf7 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -220,7 +220,7 @@ AP_DECLARE(void) ap_error_log2stderr(server_rec *s);
  * @param p The pool to use for logging
  * @param fname The name of the file to log to
  */
-void ap_log_pid(apr_pool_t *p, const char *fname);
+AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *fname);
 
 typedef struct piped_log piped_log;
 

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 9cdbd7384f628c13573c1f7920b2cb1ffdfd3f1b..0a9f4ab64159c188ebb965a75c4adb05dd7015d2 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -147,7 +147,7 @@ static int set_group_privs(void)
 }
 
 
-int unixd_setup_child(void)
+AP_DECLARE(int) unixd_setup_child(void)
 {
     if (set_group_privs()) {
        return -1;
@@ -182,7 +182,8 @@ int unixd_setup_child(void)
 }
 
 
-const char *unixd_set_user(cmd_parms *cmd, void *dummy, const char *arg)
+AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy, 
+                                        const char *arg)
 {
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
     if (err != NULL) {
@@ -208,7 +209,8 @@ const char *unixd_set_user(cmd_parms *cmd, void *dummy, const char *arg)
     return NULL;
 }
 
-const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg)
+AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy, 
+                                         const char *arg)
 {
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
     if (err != NULL) {
@@ -220,7 +222,7 @@ const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg)
     return NULL;
 }
 
-void unixd_pre_config(apr_pool_t *ptemp)
+AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp)
 {
     apr_finfo_t wrapper;
 

diff --git a/os/unix/unixd.h b/os/unix/unixd.h
index 344f5a7183f23629da87e76edc631bf5019b2520..d1b5abdeec0e07e3f8600b977180fc8c9d863f27 100644 (file)
--- a/os/unix/unixd.h
+++ b/os/unix/unixd.h
@@ -101,10 +101,12 @@ typedef struct {
 } unixd_config_rec;
 extern unixd_config_rec unixd_config;
 
-int unixd_setup_child(void);
-void unixd_pre_config(apr_pool_t *ptemp);
-const char *unixd_set_user(cmd_parms *cmd, void *dummy, const char *arg);
-const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg);
+AP_DECLARE(int) unixd_setup_child(void);
+AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp);
+AP_DECLARE(const char *) unixd_set_user(cmd_parms *cmd, void *dummy, 
+                                        const char *arg);
+AP_DECLARE(const char *) unixd_set_group(cmd_parms *cmd, void *dummy, 
+                                         const char *arg);
 #if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
 AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                            const char *arg, const char * arg2, int type);

diff --git a/server/log.c b/server/log.c
index 9a436915706ad83806c8ba38811bdce20ebe1107..0ef006d70724fe221e5d1ea463623a5d07c1837b 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -512,7 +512,7 @@ AP_DECLARE(void) ap_log_rerror(const char *file, int line, int level,
     va_end(args);
 }
 
-void ap_log_pid(apr_pool_t *p, const char *fname)
+AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *fname)
 {
     apr_file_t *pid_file = NULL;
     apr_finfo_t finfo;