Made to work under Apache 1.3 again1.97

removed debugging for config merge function

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 @@
 #define APR_SUCCESS 0
 #define APR_OFFSETOF XtOffsetOf
 
+/** method of declaring a directive with raw argument parsing */
+# define AP_INIT_RAW_ARGS(directive, func, mconfig, where, help) \
+    { directive, func, mconfig, where, RAW_ARGS, help }
 /** method of declaring a directive which takes 1 argument */
 # define AP_INIT_TAKE1(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, TAKE1, help }
@@ -23,6 +26,9 @@
 /** method of declaring a directive which takes multiple arguments */
 # define AP_INIT_ITERATE(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, ITERATE, help }
+/** method of declaring a directive which takes 1 or 3 arguments */
+# define AP_INIT_TAKE13(directive, func, mconfig, where, help) \
+    { directive, func, mconfig, where, TAKE13, help }
 /** method of declaring a directive which takes 3 arguments */
 # define AP_INIT_TAKE3(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, TAKE3, help }
@@ -35,12 +41,19 @@
 #define apr_array_header_t array_header
 #define apr_table_t table
 
+#define apr_status_t int
+#define apr_uri_t uri_components
+
 /* Functions */
 #define ap_get_remote_host(a,b,c,d) ap_get_remote_host(a,b,c)
-
+#define ap_set_deprecated NULL
+        
 #define apr_uri_unparse ap_unparse_uri_components
+#define apr_uri_parse ap_parse_uri_components
+#define ap_add_version_component(p,s) ap_add_version_component(s)
 
 #define apr_pool_create(a,b) *(a) = ap_make_sub_pool(b)
+#define apr_pool_destroy ap_destroy_pool
 #define apr_palloc ap_palloc
 #define apr_pcalloc ap_pcalloc
 #define apr_pstrdup ap_pstrdup
@@ -59,8 +72,10 @@
 
 #define apr_tolower ap_tolower
 
-static 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)));
-static inline void log_error(char *file, int line, int level, apr_status_t status, const server_rec *s, const char *fmt, ...)
+static void log_error(char *file, int line, int level, apr_status_t status, 
+        const server_rec *s, const char *fmt, ...) __attribute__ ((format (printf, 6,7)));
+static inline void log_error(char *file, int line, int level, 
+        apr_status_t status, const server_rec *s, const char *fmt, ...)
 {
         static char buff[MAX_STRING_LEN];
         va_list args;