r18411 - gnucash/trunk/src/import-export/csv - Fix compile error on current ubuntu by clashing symbol declarations in goffice and regex.h

[Christian Stimming]

Author: cstim
Date: 2009-11-11 16:07:50 -0500 (Wed, 11 Nov 2009)
New Revision: 18411
Trac: http://svn.gnucash.org/trac/changeset/18411

Modified:
   gnucash/trunk/src/import-export/csv/gnc-csv-model.c
Log:
Fix compile error on current ubuntu by clashing symbol declarations in goffice and regex.h

Modified: gnucash/trunk/src/import-export/csv/gnc-csv-model.c
===================================================================
--- gnucash/trunk/src/import-export/csv/gnc-csv-model.c	2009-11-11 20:55:52 UTC (rev 18410)
+++ gnucash/trunk/src/import-export/csv/gnc-csv-model.c	2009-11-11 21:07:50 UTC (rev 18411)
@@ -3,6 +3,13 @@
 #include "gnc-book.h"
 
 #include <glib/gi18n.h>
+
+#include <goffice/goffice-features.h>
+#if (GO_VERSION_EPOCH == 0) && (GO_VERSION_MAJOR == 7) && (GO_VERSION_MINOR == 8)
+/* For libgoffice-0.7.8, disable its internal inclusion of <regutf8.h>
+   so to avoid clashing symbol definitions with <regex.h> */
+# define GO_REGUTF8_H
+#endif
 #include <goffice/utils/go-glib-extras.h>
 
 #include <string.h>