From c694bd17981c10ffbfe67684afed1cdef432302d Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Sat, 25 Oct 2008 16:53:01 +0000 Subject: rename autoheader config file to autoconfig.h instead of config.h --- configure.ac | 2 +- src/mod_log_sql.c | 4 ++-- src/mod_log_sql_dbd.c | 8 ++++---- src/mod_log_sql_dbi.c | 2 +- src/mod_log_sql_logio.c | 2 +- src/mod_log_sql_mysql.c | 4 ++-- src/mod_log_sql_pgsql.c | 4 ++-- src/mod_log_sql_ssl.c | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index e706103..c5e7b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Required initializer AC_INIT([mod_log_sql],[1.102]) OOO_CONFIG_NICE(config.nice) AC_PREREQ(2.59) -AC_CONFIG_HEADERS(include/config.h) +AC_CONFIG_HEADERS(include/autoconfig.h) AC_CONFIG_SRCDIR(src/mod_log_sql.c) OOO_MAINTAIN_MODE diff --git a/src/mod_log_sql.c b/src/mod_log_sql.c index d319e97..be4e1f9 100644 --- a/src/mod_log_sql.c +++ b/src/mod_log_sql.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id:mod_log_sql.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */ #if defined(WITH_APACHE20) # include "apache20.h" @@ -18,7 +18,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #if APR_HAVE_UNISTD_H diff --git a/src/mod_log_sql_dbd.c b/src/mod_log_sql_dbd.c index c78a128..e641c35 100644 --- a/src/mod_log_sql_dbd.c +++ b/src/mod_log_sql_dbd.c @@ -8,7 +8,7 @@ #ifdef HAVE_CONFIG_H -/* Undefine these to prevent conflicts between Apache ap_config_auto.h and +/* Undefine these to prevent conflicts between Apache ap_config_auto.h and * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt. */ #undef PACKAGE_BUGREPORT @@ -17,7 +17,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #include "mod_log_sql.h" @@ -66,7 +66,7 @@ static void log_sql_dbd_close(logsql_dbconnection *db) /* Routine to escape the 'dangerous' characters that would otherwise * corrupt the INSERT string: ', \, and " */ -static const char *log_sql_dbd_escape(request_rec *r, const char *from_str, apr_pool_t *p, +static const char *log_sql_dbd_escape(request_rec *r, const char *from_str, apr_pool_t *p, logsql_dbconnection *db) { // Acquire a DBD connection from mod_dbd @@ -90,7 +90,7 @@ static logsql_query_ret log_sql_dbd_query(request_rec *r,logsql_dbconnection *db ap_dbd_t *dbd = log_sql_dbd_getconnection(r); if (!dbd) return LOGSQL_QUERY_NOLINK; - // Run the query + // Run the query ret = apr_dbd_query(dbd->driver, dbd->handle, &affected, query); if (ret == 0) { return LOGSQL_QUERY_SUCCESS; diff --git a/src/mod_log_sql_dbi.c b/src/mod_log_sql_dbi.c index 40a972b..5b83836 100644 --- a/src/mod_log_sql_dbi.c +++ b/src/mod_log_sql_dbi.c @@ -19,7 +19,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #include "mod_log_sql.h" diff --git a/src/mod_log_sql_logio.c b/src/mod_log_sql_logio.c index ed69acf..ebdeddd 100644 --- a/src/mod_log_sql_logio.c +++ b/src/mod_log_sql_logio.c @@ -16,7 +16,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #include "mod_log_sql.h" diff --git a/src/mod_log_sql_mysql.c b/src/mod_log_sql_mysql.c index 942c03a..902cadf 100644 --- a/src/mod_log_sql_mysql.c +++ b/src/mod_log_sql_mysql.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id:mod_log_sql_mysql.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */ #if defined(WITH_APACHE20) # include "apache20.h" @@ -18,7 +18,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #include "mod_log_sql.h" diff --git a/src/mod_log_sql_pgsql.c b/src/mod_log_sql_pgsql.c index 4e12920..dcfbd73 100644 --- a/src/mod_log_sql_pgsql.c +++ b/src/mod_log_sql_pgsql.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id:mod_log_sql_pgsql.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */ #if defined(WITH_APACHE20) # include "apache20.h" @@ -19,7 +19,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #include "mod_log_sql.h" diff --git a/src/mod_log_sql_ssl.c b/src/mod_log_sql_ssl.c index 47bba8b..b3a4929 100644 --- a/src/mod_log_sql_ssl.c +++ b/src/mod_log_sql_ssl.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id:mod_log_sql_ssl.c 180 2008-09-21 15:54:12Z urkle@drip.ws $ */ #if defined(WITH_APACHE20) # include "apache20.h" @@ -18,7 +18,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" +#include "autoconfig.h" #endif #include "mod_log_sql.h" -- cgit