apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r231274 - in /apr/apr-util/trunk: dbd/apr_dbd.c dbd/apr_dbd_pgsql.c dbd/apr_dbd_sqlite2.c dbd/apr_dbd_sqlite3.c include/apr_dbd.h include/private/apr_dbd_internal.h
Date Wed, 10 Aug 2005 15:57:00 GMT
Author: niq
Date: Wed Aug 10 08:56:53 2005
New Revision: 231274

URL: http://svn.apache.org/viewcvs?rev=231274&view=rev
Log:
Remove conditional include from apr_dbd.h.
That means putting it explicitly in to all the drivers.  *sigh*

Modified:
    apr/apr-util/trunk/dbd/apr_dbd.c
    apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
    apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c
    apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c
    apr/apr-util/trunk/include/apr_dbd.h
    apr/apr-util/trunk/include/private/apr_dbd_internal.h

Modified: apr/apr-util/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd.c?rev=231274&r1=231273&r2=231274&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd.c Wed Aug 10 08:56:53 2005
@@ -16,8 +16,6 @@
 
 #include <stdio.h>
 
-#define APR_DBD_C
-
 #include "apu.h"
 #include "apr_pools.h"
 #include "apr_dbd_internal.h"

Modified: apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c?rev=231274&r1=231273&r2=231274&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Wed Aug 10 08:56:53 2005
@@ -64,6 +64,7 @@
                                  || ((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,

Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c?rev=231274&r1=231273&r2=231274&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Wed Aug 10 08:56:53 2005
@@ -65,6 +65,7 @@
 } apr_dbd_prepared_t;
 
 #define APR_DBD_INTERNAL
+#include "apr_dbd_internal.h"
 #include "apr_dbd.h"
 
 #define FREE_ERROR_MSG(dbd) \

Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c?rev=231274&r1=231273&r2=231274&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c Wed Aug 10 08:56:53 2005
@@ -80,6 +80,7 @@
 		|| ((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)

Modified: apr/apr-util/trunk/include/apr_dbd.h
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_dbd.h?rev=231274&r1=231273&r2=231274&view=diff
==============================================================================
--- apr/apr-util/trunk/include/apr_dbd.h (original)
+++ apr/apr-util/trunk/include/apr_dbd.h Wed Aug 10 08:56:53 2005
@@ -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;

Modified: apr/apr-util/trunk/include/private/apr_dbd_internal.h
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/private/apr_dbd_internal.h?rev=231274&r1=231273&r2=231274&view=diff
==============================================================================
--- apr/apr-util/trunk/include/private/apr_dbd_internal.h (original)
+++ apr/apr-util/trunk/include/private/apr_dbd_internal.h Wed Aug 10 08:56:53 2005
@@ -26,6 +26,7 @@
 #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;



Mime
View raw message