1 files changed, 11 insertions, 43 deletions

diff --git a/apache13.h b/apache13.h
index ce4ec64..8181c43 100644
--- a/apache13.h
+++ b/apache13.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/apache13.h,v 1.4 2004/02/05 21:59:46 urkle Exp $ */
 #ifndef APACHE13_H
 #define APACHE13_H
 
@@ -8,27 +8,25 @@
 #include "http_core.h"
 
 /* Defines */
-#define AP_MODULE_DECLARE_DATA MODULE_VAR_EXPORT
+#define AP_MODULE_DECLARE_DATA
 #define APR_OFF_T_FMT "ld"
 #define APR_PID_T_FMT "d"
 #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 }
+/*AP_INIT_TAKE1("LogSQLTransferLogTable", set_server_nmv_string_slot,
+         (void *)APR_OFFSETOF(logsql_state, transfer_table_name), RSRC_CONF, 
+         "The database table that holds the transfer log")
+
+{"LogSQLTransferLogTable", set_log_sql_transfer_table,                  NULL,   RSRC_CONF,      TAKE1,
+         "The database table that holds the transfer log"}*/
+
 /** method of declaring a directive which takes 1 argument */
 # define AP_INIT_TAKE1(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, TAKE1, help }
-/** method of declaring a directive which takes 2 argument */
-# define AP_INIT_TAKE2(directive, func, mconfig, where, help) \
-    { directive, func, mconfig, where, TAKE2, help }
 /** 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 }
@@ -39,35 +37,21 @@
 /* Types */
 #define apr_pool_t pool
 #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
 #define apr_pstrcat ap_pstrcat
 #define apr_psprintf ap_psprintf
 #define apr_snprintf ap_snprintf
-#define ap_strchr strchr
-#define ap_strchr_c strchr
-#define ap_strstr strstr
-#define ap_strstr_c strstr
 
-#define apr_table_set ap_table_set
 #define apr_table_get ap_table_get
-#define apr_table_make ap_make_table
 
 #define apr_array_push ap_push_array
 #define apr_array_make ap_make_array
@@ -76,22 +60,6 @@
 
 #define apr_tolower ap_tolower
 
-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)));
-        
-#ifndef WIN32
-inline
-#endif
-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;
-        va_start(args, fmt);
-        ap_vsnprintf(buff,MAX_STRING_LEN, fmt,args);
-        ap_log_error(file,line,level | APLOG_NOERRNO ,s,"%s",buff);
-        va_end(args);
-}
-
+#define log_error ap_log_error
 
 #endif /* APACHE13_H */