summaryrefslogtreecommitdiffstats
path: root/apache13.h
diff options
context:
space:
mode:
Diffstat (limited to 'apache13.h')
-rw-r--r--apache13.h21
1 files changed, 18 insertions, 3 deletions
diff --git a/apache13.h b/apache13.h
index d5aeac5..38a9cae 100644
--- a/apache13.h
+++ b/apache13.h
@@ -14,6 +14,9 @@
14#define APR_SUCCESS 0 14#define APR_SUCCESS 0
15#define APR_OFFSETOF XtOffsetOf 15#define APR_OFFSETOF XtOffsetOf
16 16
17/** method of declaring a directive with raw argument parsing */
18# define AP_INIT_RAW_ARGS(directive, func, mconfig, where, help) \
19 { directive, func, mconfig, where, RAW_ARGS, help }
17/** method of declaring a directive which takes 1 argument */ 20/** method of declaring a directive which takes 1 argument */
18# define AP_INIT_TAKE1(directive, func, mconfig, where, help) \ 21# define AP_INIT_TAKE1(directive, func, mconfig, where, help) \
19 { directive, func, mconfig, where, TAKE1, help } 22 { directive, func, mconfig, where, TAKE1, help }
@@ -23,6 +26,9 @@
23/** method of declaring a directive which takes multiple arguments */ 26/** method of declaring a directive which takes multiple arguments */
24# define AP_INIT_ITERATE(directive, func, mconfig, where, help) \ 27# define AP_INIT_ITERATE(directive, func, mconfig, where, help) \
25 { directive, func, mconfig, where, ITERATE, help } 28 { directive, func, mconfig, where, ITERATE, help }
29/** method of declaring a directive which takes 1 or 3 arguments */
30# define AP_INIT_TAKE13(directive, func, mconfig, where, help) \
31 { directive, func, mconfig, where, TAKE13, help }
26/** method of declaring a directive which takes 3 arguments */ 32/** method of declaring a directive which takes 3 arguments */
27# define AP_INIT_TAKE3(directive, func, mconfig, where, help) \ 33# define AP_INIT_TAKE3(directive, func, mconfig, where, help) \
28 { directive, func, mconfig, where, TAKE3, help } 34 { directive, func, mconfig, where, TAKE3, help }
@@ -35,12 +41,19 @@
35#define apr_array_header_t array_header 41#define apr_array_header_t array_header
36#define apr_table_t table 42#define apr_table_t table
37 43
44#define apr_status_t int
45#define apr_uri_t uri_components
46
38/* Functions */ 47/* Functions */
39#define ap_get_remote_host(a,b,c,d) ap_get_remote_host(a,b,c) 48#define ap_get_remote_host(a,b,c,d) ap_get_remote_host(a,b,c)
40 49#define ap_set_deprecated NULL
50
41#define apr_uri_unparse ap_unparse_uri_components 51#define apr_uri_unparse ap_unparse_uri_components
52#define apr_uri_parse ap_parse_uri_components
53#define ap_add_version_component(p,s) ap_add_version_component(s)
42 54
43#define apr_pool_create(a,b) *(a) = ap_make_sub_pool(b) 55#define apr_pool_create(a,b) *(a) = ap_make_sub_pool(b)
56#define apr_pool_destroy ap_destroy_pool
44#define apr_palloc ap_palloc 57#define apr_palloc ap_palloc
45#define apr_pcalloc ap_pcalloc 58#define apr_pcalloc ap_pcalloc
46#define apr_pstrdup ap_pstrdup 59#define apr_pstrdup ap_pstrdup
@@ -59,8 +72,10 @@
59 72
60#define apr_tolower ap_tolower 73#define apr_tolower ap_tolower
61 74
62static void log_error(char *file, int line, int level, apr_status_t status, const server_rec *s, const char *fmt, ...) __attribute__ ((format (printf, 5,6))); 75static void log_error(char *file, int line, int level, apr_status_t status,
63static inline void log_error(char *file, int line, int level, apr_status_t status, const server_rec *s, const char *fmt, ...) 76 const server_rec *s, const char *fmt, ...) __attribute__ ((format (printf, 6,7)));
77static inline void log_error(char *file, int line, int level,
78 apr_status_t status, const server_rec *s, const char *fmt, ...)
64{ 79{
65 static char buff[MAX_STRING_LEN]; 80 static char buff[MAX_STRING_LEN];
66 va_list args; 81 va_list args;