Refactoring to drop apr_config.h, renamed APU_MODULE_DECLARE_DATA

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@891835 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 14 insertions, 13 deletions

diff --git a/dbd/apr_dbd.c b/dbd/apr_dbd.c
index 47dc12426..656870320 100644
--- a/dbd/apr_dbd.c
+++ b/dbd/apr_dbd.c
@@ -17,9 +17,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "apu_config.h"
 #include "apu.h"
-
+#include "apr_private.h"
 #include "apr_pools.h"
 #include "apr_dso.h"
 #include "apr_strings.h"
diff --git a/dbd/apr_dbd_freetds.c b/dbd/apr_dbd_freetds.c
index 9a0cae793..a00db4b88 100644
--- a/dbd/apr_dbd_freetds.c
+++ b/dbd/apr_dbd_freetds.c
@@ -15,7 +15,7 @@
  */
 
 #include "apu.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 /* COMPILE_STUBS: compile stubs for unimplemented functions.
  *
@@ -764,7 +764,7 @@ static apr_status_t dbd_freetds_datum_get(const apr_dbd_row_t *row, int n,
 }
 #endif
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = {
     "freetds",
     dbd_freetds_init,
     dbd_freetds_native,
diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c
index df4f6e3b0..fdd14f6f2 100644
--- a/dbd/apr_dbd_mysql.c
+++ b/dbd/apr_dbd_mysql.c
@@ -19,7 +19,7 @@
 #if APU_HAVE_MYSQL
 
 #include "apu_version.h"
-#include "apu_config.h"
+#include "apr_private.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -1291,7 +1291,7 @@ static void dbd_mysql_init(apr_pool_t *pool)
     /* FIXME: this is a guess; find out what it really does */
     apr_pool_cleanup_register(pool, NULL, thread_end, apr_pool_cleanup_null);
 }
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
     "mysql",
     dbd_mysql_init,
     dbd_mysql_native,
diff --git a/dbd/apr_dbd_odbc.c b/dbd/apr_dbd_odbc.c
index a393a29c1..a69e7e376 100644
--- a/dbd/apr_dbd_odbc.c
+++ b/dbd/apr_dbd_odbc.c
@@ -15,6 +15,7 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 #if APU_HAVE_ODBC
 
 #include "apr.h"
@@ -26,7 +27,6 @@
 #include "apr_dbd_internal.h"
 #include "apr_thread_proc.h"
 #include "apu_version.h"
-#include "apu_config.h"
 
 #include <stdlib.h>
 
diff --git a/dbd/apr_dbd_oracle.c b/dbd/apr_dbd_oracle.c
index 7ef05f968..1de349018 100644
--- a/dbd/apr_dbd_oracle.c
+++ b/dbd/apr_dbd_oracle.c
@@ -50,6 +50,7 @@
 #endif
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_ORACLE
 
@@ -2184,7 +2185,7 @@ static int dbd_oracle_num_tuples(apr_dbd_results_t* res)
     return res->nrows;
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_oracle_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_oracle_driver = {
     "oracle",
     dbd_oracle_init,
     dbd_oracle_native,
diff --git a/dbd/apr_dbd_pgsql.c b/dbd/apr_dbd_pgsql.c
index 21f2179b8..989945c06 100644
--- a/dbd/apr_dbd_pgsql.c
+++ b/dbd/apr_dbd_pgsql.c
@@ -15,11 +15,10 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_PGSQL
 
-#include "apu_config.h"
-
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -1279,7 +1278,7 @@ static int dbd_pgsql_num_tuples(apr_dbd_results_t* res)
     }
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
     "pgsql",
     NULL,
     dbd_pgsql_native,
diff --git a/dbd/apr_dbd_sqlite2.c b/dbd/apr_dbd_sqlite2.c
index 132ccc4c6..22bf2de5a 100644
--- a/dbd/apr_dbd_sqlite2.c
+++ b/dbd/apr_dbd_sqlite2.c
@@ -15,6 +15,7 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_SQLITE2
 
@@ -530,7 +531,7 @@ static int dbd_sqlite_num_tuples(apr_dbd_results_t * res)
     return res->ntuples;
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
     "sqlite2",
     NULL,
     dbd_sqlite_native,
diff --git a/dbd/apr_dbd_sqlite3.c b/dbd/apr_dbd_sqlite3.c
index 02b2c02d3..2dd51d217 100644
--- a/dbd/apr_dbd_sqlite3.c
+++ b/dbd/apr_dbd_sqlite3.c
@@ -15,6 +15,7 @@
  */
 
 #include "apu.h"
+#include "apr_private.h"
 
 #if APU_HAVE_SQLITE3
 
@@ -880,7 +881,7 @@ static int dbd_sqlite3_num_tuples(apr_dbd_results_t *res)
     return res->tuples;
 }
 
-APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
+APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
     "sqlite3",
     NULL,
     dbd_sqlite3_native,