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

@@ -1,4 +1,9 @@
-2006-05-17  Mike Alexander  <mta@arbortext.com>
+2006-05-19  David Hampton  <hampton@employees.org>
+
+	* src/engine/engine-helpers.c: More of the patch from Bill
+	Nottingham for compiling with guile 1.8.
+
+2006-05-17  Mike Alexander  <mta@umich.edu>
 
 	* From bugzilla #342153.
         * src/engine/cap-gains.c (finder_helper): Don't add a split with

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);