From 6ad58b7d5c5d0ca53ec644021f0108811bceac4a Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Fri, 05 Mar 2004 00:30:58 +0000 Subject: updated compatability header for Apache 1.3 Changed log_error routing for Apache 1.3 to include APLOG_NOERRNO re-added quarter second delay between reconnect and query retry. updated makefile to generate HTML version of docbook docs. added comments to mod_log_sql_mysql.c updated documentation about --with-db-inc configure option --- (limited to 'apache13.h') diff --git a/apache13.h b/apache13.h index 11e8dcb..6d756b6 100644 --- a/apache13.h +++ b/apache13.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvs/mod_log_sql/apache13.h,v 1.5 2004/02/29 23:36:17 urkle Exp $ */ +/* $Header: /home/cvs/mod_log_sql/apache13.h,v 1.6 2004/03/05 00:30:58 urkle Exp $ */ #ifndef APACHE13_H #define APACHE13_H @@ -24,6 +24,9 @@ /** 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 } @@ -37,6 +40,7 @@ /* Types */ #define apr_pool_t pool #define apr_array_header_t array_header +#define apr_table_t table /* Functions */ #define ap_get_remote_host(a,b,c,d) ap_get_remote_host(a,b,c) @@ -62,6 +66,16 @@ #define apr_tolower ap_tolower -#define log_error ap_log_error +static void log_error(char *file, int line, int level, const server_rec *s, const char *fmt, ...) __attribute__ ((format (printf, 5,6))); +static inline void log_error(char *file, int line, int level, 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); +} + #endif /* APACHE13_H */ -- cgit v0.9.2