IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* Mike Alexander's Better test for conflict between optimization and FORTIFY_SOURCE
* Fix crash with libdbi >= 0.9.0, based on a patch by Colin Law
This commit is contained in:
Geert Janssens 2014-05-05 17:57:03 +02:00
commit cd79b1f5de
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/dbi/gnc-backend-dbi.c
View File

@ -292,7 +292,7 @@ gnc_dbi_sqlite3_session_begin( QofBackend *qbe, QofSession *session,
} }
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
be->conn = dbi_conn_new_r( "sqlite3", dbi_instance ); be->conn = dbi_conn_new_r( "sqlite3", &dbi_instance );
#else #else
be->conn = dbi_conn_new( "sqlite3" ); be->conn = dbi_conn_new( "sqlite3" );
#endif #endif
@ -822,7 +822,7 @@ gnc_dbi_mysql_session_begin( QofBackend* qbe, QofSession *session,
dbi_conn_close( be->conn ); dbi_conn_close( be->conn );
} }
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
be->conn = dbi_conn_new_r( "mysql", dbi_instance ); be->conn = dbi_conn_new_r( "mysql", &dbi_instance );
#else #else
be->conn = dbi_conn_new( "mysql" ); be->conn = dbi_conn_new( "mysql" );
#endif #endif
@ -911,7 +911,7 @@ gnc_dbi_mysql_session_begin( QofBackend* qbe, QofSession *session,
// Try again to connect to the db // Try again to connect to the db
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
be->conn = dbi_conn_new_r( "mysql", dbi_instance ); be->conn = dbi_conn_new_r( "mysql", &dbi_instance );
#else #else
be->conn = dbi_conn_new( "mysql" ); be->conn = dbi_conn_new( "mysql" );
#endif #endif
@ -1168,7 +1168,7 @@ gnc_dbi_postgres_session_begin( QofBackend *qbe, QofSession *session,
} }
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
be->conn = dbi_conn_new_r( "pgsql", dbi_instance ); be->conn = dbi_conn_new_r( "pgsql", &dbi_instance );
#else #else
be->conn = dbi_conn_new( "pgsql" ); be->conn = dbi_conn_new( "pgsql" );
#endif #endif
@ -1259,7 +1259,7 @@ gnc_dbi_postgres_session_begin( QofBackend *qbe, QofSession *session,
// Try again to connect to the db // Try again to connect to the db
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
be->conn = dbi_conn_new_r( "pgsql", dbi_instance ); be->conn = dbi_conn_new_r( "pgsql", &dbi_instance );
#else #else
be->conn = dbi_conn_new( "pgsql" ); be->conn = dbi_conn_new( "pgsql" );
#endif #endif
@ -1869,7 +1869,7 @@ gnc_module_init_backend_dbi(void)
/* dbi_initialize returns -1 in case of errors */ /* dbi_initialize returns -1 in case of errors */
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
num_drivers = dbi_initialize_r( driver_dir, dbi_instance ); num_drivers = dbi_initialize_r( driver_dir, &dbi_instance );
#else #else
num_drivers = dbi_initialize( driver_dir ); num_drivers = dbi_initialize( driver_dir );
#endif #endif
@ -1885,7 +1885,7 @@ gnc_module_init_backend_dbi(void)
do do
{ {
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
driver = dbi_driver_list_r( driver, dbi_instance ); driver = dbi_driver_list_r( driver, &dbi_instance );
#else #else
driver = dbi_driver_list( driver ); driver = dbi_driver_list( driver );
#endif #endif
@ -1984,7 +1984,7 @@ void
gnc_module_finalize_backend_dbi( void ) gnc_module_finalize_backend_dbi( void )
{ {
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
dbi_shutdown_r(dbi_instance); dbi_shutdown_r(&dbi_instance);
#else #else
dbi_shutdown(); dbi_shutdown();
#endif #endif