[Gnucash-changes] r13782 - gnucash/trunk - Fixes to compile with gcc4.

[David Hampton]

Author: hampton
Date: 2006-04-14 18:44:28 -0400 (Fri, 14 Apr 2006)
New Revision: 13782
Trac: http://svn.gnucash.org/trac/changeset/13782

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/backend/file/io-gncxml-v2.c
   gnucash/trunk/src/gnome-utils/druid-gnc-xml-import.c
Log:
Fixes to compile with gcc4.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-04-14 17:38:57 UTC (rev 13781)
+++ gnucash/trunk/ChangeLog	2006-04-14 22:44:28 UTC (rev 13782)
@@ -1,3 +1,9 @@
+2006-04-14  David Hampton  <hampton at employees.org>
+
+	* src/backend/file/io-gncxml-v2.c:
+	* src/gnome-utils/druid-gnc-xml-import.c: Fixes to compile with
+	gcc4.
+
 2006-04-14  Andreas Köhler  <andi5.py at gmx.net>
 
 	* lib/libqof/qof/qofbackend.h:

Modified: gnucash/trunk/src/backend/file/io-gncxml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/io-gncxml-v2.c	2006-04-14 17:38:57 UTC (rev 13781)
+++ gnucash/trunk/src/backend/file/io-gncxml-v2.c	2006-04-14 22:44:28 UTC (rev 13782)
@@ -1519,7 +1519,7 @@
     while (1) {
         gchar *line, *word, *utf8;
         gchar **word_array, **word_cursor;
-        conv_type *conv;
+        conv_type *conv = NULL;
 
         status = g_io_channel_read_line(channel, &line, NULL, NULL, error);
         if (status == G_IO_STATUS_EOF) {

Modified: gnucash/trunk/src/gnome-utils/druid-gnc-xml-import.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-gnc-xml-import.c	2006-04-14 17:38:57 UTC (rev 13781)
+++ gnucash/trunk/src/gnome-utils/druid-gnc-xml-import.c	2006-04-14 22:44:28 UTC (rev 13782)
@@ -248,15 +248,19 @@
 static gboolean
 gxi_find_backend_symbols ()
 {
+  gpointer symbol;
+
   if (!allsymbols)
     allsymbols = g_module_open (NULL, 0);
 
-  if (!g_module_symbol (allsymbols, "gnc_xml2_find_ambiguous",
-                        (gpointer*) &find_ambiguous) ||
-      !g_module_symbol (allsymbols, "gnc_xml2_parse_with_subst",
-                        (gpointer*) &parse_with_subst))
+  if (!g_module_symbol (allsymbols, "gnc_xml2_find_ambiguous", &symbol))
     return FALSE;
+  find_ambiguous = symbol;
 
+  if (!g_module_symbol (allsymbols, "gnc_xml2_parse_with_subst", &symbol))
+    return FALSE;
+  parse_with_subst = symbol;
+
   return TRUE;
 }