From 74523d95e8cca8a12e115cd47cc5d7542d658c54 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Fri, 19 May 2006 23:30:58 +0000 Subject: [PATCH] More of the patch from Bill Nottingham for compiling with guile 1.8. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14136 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 ++++++- src/engine/engine-helpers.c | 7 ------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5d3e43e3a..8a7eb77e58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2006-05-17 Mike Alexander +2006-05-19 David Hampton + + * src/engine/engine-helpers.c: More of the patch from Bill + Nottingham for compiling with guile 1.8. + +2006-05-17 Mike Alexander * From bugzilla #342153. * src/engine/cap-gains.c (finder_helper): Don't add a split with diff --git a/src/engine/engine-helpers.c b/src/engine/engine-helpers.c index fff0e25086..42c28f20e1 100644 --- a/src/engine/engine-helpers.c +++ b/src/engine/engine-helpers.c @@ -1686,8 +1686,6 @@ gnc_query2scm (QofQuery *q) if (!q) return SCM_BOOL_F; - ++scm_block_gc; - /* terms */ pair = scm_cons (gnc_query_terms2scm (qof_query_get_terms (q)), SCM_EOL); pair = scm_cons (scm_str2symbol ("terms"), pair); @@ -1723,7 +1721,6 @@ gnc_query2scm (QofQuery *q) /* Reverse this list; tag it as 'query-v2' */ pair = scm_reverse (query_scm); - --scm_block_gc; return scm_cons (scm_str2symbol ("query-v2"), pair); } @@ -1928,8 +1925,6 @@ gnc_scm2query_v2 (SCM query_scm) gboolean si1 = TRUE, si2 = TRUE, si3 = TRUE; int max_results = -1; - ++scm_block_gc; - while (!SCM_NULLP (query_scm)) { const gchar *symbol; @@ -2008,8 +2003,6 @@ gnc_scm2query_v2 (SCM query_scm) } } - --scm_block_gc; - if (ok && search_for) { qof_query_search_for (q, search_for); qof_query_set_sort_order (q, sp1, sp2, sp3);