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

Revert "Fix broken test-backend-dbi with libdbi 0.9."

Browse Source 
This reverts commit 321a159af2.
Got two unrelated changes into a single changeset.
This commit is contained in:
John Ralls 2014-08-07 10:23:50 -07:00
parent 321a159af2
commit 46455c7518
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -34,7 +34,7 @@ GNUCASH_NANO_VERSION=0
#src/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load. #src/backend/dbi/gnc-backend-dbi.c:gnc_dbi_load.
GNUCASH_RESAVE_VERSION=19920 GNUCASH_RESAVE_VERSION=19920
# Initialize automake -- make sure we have at least version 1.9 # Initialize automake -- make sure we have at least version 1.9
AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects]) AM_INIT_AUTOMAKE([1.9 dist-bzip2])
# Parse out the version number # Parse out the version number
GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION

5
src/backend/dbi/test/test-backend-dbi-basic.c
View File

@ -36,7 +36,7 @@
#if LIBDBI_VERSION >= 900 #if LIBDBI_VERSION >= 900
#define HAVE_LIBDBI_R 1 #define HAVE_LIBDBI_R 1
static dbi_inst dbi_instance = NULL; static dbi_inst dbi_instance;
#else #else
#define HAVE_LIBDBI_R 0 #define HAVE_LIBDBI_R 0
#endif #endif
@ -597,11 +597,8 @@ test_suite_gnc_backend_dbi (void)
dbi_driver driver = NULL; dbi_driver driver = NULL;
GList *drivers = NULL; GList *drivers = NULL;
#if HAVE_LIBDBI_R #if HAVE_LIBDBI_R
if (dbi_instance == NULL)
dbi_initialize_r (NULL, &dbi_instance);
while ((driver = dbi_driver_list_r (driver, dbi_instance))) while ((driver = dbi_driver_list_r (driver, dbi_instance)))
#else #else
dbi_initialize (NULL);
while ((driver = dbi_driver_list (driver))) while ((driver = dbi_driver_list (driver)))
#endif #endif
{ {