Commit 30e9b861 authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

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
parent b91f712f

include/http_log.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

os/unix/unixd.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

os/unix/unixd.h

+6 −4
Original line number Diff line number Diff line
@@ -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);

server/log.c

+1 −1
Original line number Diff line number Diff line
@@ -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;