diff options
| author | niq <niq@13f79535-47bb-0310-9956-ffa450edef68> | 2005-08-10 15:56:53 +0000 |
|---|---|---|
| committer | niq <niq@13f79535-47bb-0310-9956-ffa450edef68> | 2005-08-10 15:56:53 +0000 |
| commit | 6fa57b16a278542b84517b09f08cc38b69b5b520 (patch) | |
| tree | 435eee37426fe5bfd083e65ebed6645642f25e63 | |
| parent | 7cbbbb4c704bcba16132ec557a9be4d11d212b81 (diff) | |
| download | libapr-util-6fa57b16a278542b84517b09f08cc38b69b5b520.tar.gz | |
Remove conditional include from apr_dbd.h.
That means putting it explicitly in to all the drivers. *sigh*
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@231274 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | dbd/apr_dbd.c | 2 | ||||
| -rw-r--r-- | dbd/apr_dbd_pgsql.c | 1 | ||||
| -rw-r--r-- | dbd/apr_dbd_sqlite2.c | 1 | ||||
| -rw-r--r-- | dbd/apr_dbd_sqlite3.c | 1 | ||||
| -rw-r--r-- | include/apr_dbd.h | 4 | ||||
| -rw-r--r-- | include/private/apr_dbd_internal.h | 1 |
6 files changed, 5 insertions, 5 deletions
diff --git a/dbd/apr_dbd.c b/dbd/apr_dbd.c index 34116eca..f693f358 100644 --- a/dbd/apr_dbd.c +++ b/dbd/apr_dbd.c @@ -16,8 +16,6 @@ #include <stdio.h> -#define APR_DBD_C - #include "apu.h" #include "apr_pools.h" #include "apr_dbd_internal.h" diff --git a/dbd/apr_dbd_pgsql.c b/dbd/apr_dbd_pgsql.c index 758d8f60..c6fe4912 100644 --- a/dbd/apr_dbd_pgsql.c +++ b/dbd/apr_dbd_pgsql.c @@ -64,6 +64,7 @@ typedef struct { || ((x) == PGRES_TUPLES_OK)) #define APR_DBD_INTERNAL +#include "apr_dbd_internal.h" #include "apr_dbd.h" static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql, diff --git a/dbd/apr_dbd_sqlite2.c b/dbd/apr_dbd_sqlite2.c index af97760f..0ad94cce 100644 --- a/dbd/apr_dbd_sqlite2.c +++ b/dbd/apr_dbd_sqlite2.c @@ -65,6 +65,7 @@ typedef struct } apr_dbd_prepared_t; #define APR_DBD_INTERNAL +#include "apr_dbd_internal.h" #include "apr_dbd.h" #define FREE_ERROR_MSG(dbd) \ diff --git a/dbd/apr_dbd_sqlite3.c b/dbd/apr_dbd_sqlite3.c index 8b62edef..47b1e5b9 100644 --- a/dbd/apr_dbd_sqlite3.c +++ b/dbd/apr_dbd_sqlite3.c @@ -80,6 +80,7 @@ typedef struct { || ((x) == SQLITE_OK )) #define APR_DBD_INTERNAL +#include "apr_dbd_internal.h" #include "apr_dbd.h" static int dbd_sqlite3_select(apr_pool_t * pool, apr_dbd_t * sql, apr_dbd_results_t ** results, const char *query, int seek) diff --git a/include/apr_dbd.h b/include/apr_dbd.h index a9207fbf..2be36367 100644 --- a/include/apr_dbd.h +++ b/include/apr_dbd.h @@ -25,10 +25,8 @@ extern "C" { #endif -#if defined APR_DBD_INTERNAL || defined APR_DBD_C -#include "apr_dbd_internal.h" -#else /* These are opaque structs. Instantiation is up to each backend */ +#ifndef APR_DBD_INTERNAL_H typedef struct apr_dbd_driver_t apr_dbd_driver_t; typedef struct apr_dbd_t apr_dbd_t; typedef struct apr_dbd_transaction_t apr_dbd_transaction_t; diff --git a/include/private/apr_dbd_internal.h b/include/private/apr_dbd_internal.h index 675135d7..712d0349 100644 --- a/include/private/apr_dbd_internal.h +++ b/include/private/apr_dbd_internal.h @@ -26,6 +26,7 @@ extern "C" { #endif #ifndef APR_DBD_INTERNAL +#define APR_DBD_INTERNAL typedef struct apr_dbd_t apr_dbd_t; typedef struct apr_dbd_transaction_t apr_dbd_transaction_t; typedef struct apr_dbd_results_t apr_dbd_results_t; |