VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Victor J. Orlikowski
2001-07-30 17:55:38 +00:00
parent a685e2a0e8
commit 45b321443b
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/http_log.h
View File

@ -220,7 +220,7 @@ AP_DECLARE(void) ap_error_log2stderr(server_rec *s);
* @param p The pool to use for logging * @param p The pool to use for logging
* @param fname The name of the file to log to * @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; typedef struct piped_log piped_log;

10
os/unix/unixd.c
View File

@ -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()) { if (set_group_privs()) {
return -1; 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); const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) { if (err != NULL) {
@ -208,7 +209,8 @@ const char *unixd_set_user(cmd_parms *cmd, void *dummy, const char *arg)
return NULL; 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); const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) { if (err != NULL) {
@ -220,7 +222,7 @@ const char *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg)
return NULL; return NULL;
} }
void unixd_pre_config(apr_pool_t *ptemp) AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp)
{ {
apr_finfo_t wrapper; apr_finfo_t wrapper;

10
os/unix/unixd.h
View File

@ -101,10 +101,12 @@ typedef struct {
} unixd_config_rec; } unixd_config_rec;
extern unixd_config_rec unixd_config; extern unixd_config_rec unixd_config;
int unixd_setup_child(void); AP_DECLARE(int) unixd_setup_child(void);
void unixd_pre_config(apr_pool_t *ptemp); AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp);
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 *unixd_set_group(cmd_parms *cmd, void *dummy, const char *arg); 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) #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, AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
const char *arg, const char * arg2, int type); const char *arg, const char * arg2, int type);

2
server/log.c
View File

@ -512,7 +512,7 @@ AP_DECLARE(void) ap_log_rerror(const char *file, int line, int level,
va_end(args); 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_file_t *pid_file = NULL;
apr_finfo_t finfo; apr_finfo_t finfo;