diff options
author | Greg Stein <gstein@apache.org> | 2001-02-10 11:59:58 +0000 |
---|---|---|
committer | Greg Stein <gstein@apache.org> | 2001-02-10 11:59:58 +0000 |
commit | 0513fb50e4da36e0280009fbdc4eaff79fa338d3 (patch) | |
tree | 745b5713e022b198c5728c09ab372c7ba1404c0b /include/ap_config.h | |
parent | 6fc8754f2b5fef01a25f42015965ca6f76094503 (diff) | |
download | httpd-0513fb50e4da36e0280009fbdc4eaff79fa338d3.tar.gz |
*) clean out some old crap from ap_config.h; other simplifications; don't
include stuff randomly (let users include them explicitly)
*) toss ap_config_path.h -- we can put those values into ap_config_auto.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88057 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/ap_config.h')
-rw-r--r-- | include/ap_config.h | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/include/ap_config.h b/include/ap_config.h index add4a48edf..9ef13bd6ca 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -52,11 +52,10 @@ * <http://www.apache.org/>. */ -#ifndef AP_AC_CONFIG_H -#define AP_AC_CONFIG_H +#ifndef AP_CONFIG_H +#define AP_CONFIG_H -#include "ap_mmn.h" /* MODULE_MAGIC_NUMBER_ */ -#include "apr_lib.h" /* apr_isfoo() macros */ +#include "apr.h" #include "apr_hooks.h" /** @@ -149,10 +148,10 @@ */ #define AP_DECLARE_HOOK(ret,name,args) \ -APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args) + APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args) #define AP_IMPLEMENT_HOOK_BASE(name) \ -APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name) + APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name) /** * Implement an Apache core hook that has no return code, and @@ -169,7 +168,7 @@ APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name) * @deffunc AP_IMPLEMENT_HOOK_VOID(name, args_decl, args_use) */ #define AP_IMPLEMENT_HOOK_VOID(name,args_decl,args_use) \ -APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use) + APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use) /** * Implement an Apache core hook that runs until one of the functions @@ -193,7 +192,8 @@ APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use) * @deffunc AP_IMPLEMENT_HOOK_RUN_ALL(ret, name, args_decl, args_use, ok, decline) */ #define AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \ -APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl,args_use,ok,decline) + APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl, \ + args_use,ok,decline) /** * Implement a hook that runs until the first function that returns @@ -214,21 +214,15 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl,args_use,ok,decline * @deffunc AP_IMPLEMENT_HOOK_RUN_FIRST(ret, name, args_decl, args_use, decline) */ #define AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \ -APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) + APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl, \ + args_use,decline) -#ifdef WIN32 #include "os.h" -#else +#ifndef WIN32 #include "ap_config_auto.h" -#include "ap_config_path.h" -#include "os.h" -#endif /* !WIN32 */ -#include "apr.h" -#ifdef STDC_HEADERS -#include <stdlib.h> -#include <string.h> #endif + #ifdef SIGWAIT_TAKES_ONE_ARG #define ap_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0) #else @@ -244,13 +238,6 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) #define NO_LINGCLOSE #endif -#ifdef SCO5 -/* This allows Apache to run from a startup script on a SCO box in high - * security (C2) mode. - */ -#define SecureWare -#endif - /* XXX - The PHP4 comments say -D_HPUX_SOURCE is obsolete. */ /* TODO - none of the dynamic linking defines are in yet, but that's because @@ -267,7 +254,7 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) /* If APR has OTHER_CHILD logic, use reliable piped logs. */ -#if (APR_HAS_OTHER_CHILD) +#if APR_HAS_OTHER_CHILD #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE #endif @@ -275,4 +262,4 @@ APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline) #define APACHE_XLATE #endif -#endif /* AP_AC_CONFIG_H */ +#endif /* AP_CONFIG_H */ |