From ffa2c6ed896a95690c201b5a41333f8a447b0385 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Wed, 11 Nov 2009 21:07:50 +0000 Subject: [PATCH] Fix compile error on current ubuntu by clashing symbol declarations in goffice and regex.h git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18411 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/csv/gnc-csv-model.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/import-export/csv/gnc-csv-model.c b/src/import-export/csv/gnc-csv-model.c index 0226b8aaf4..45529e4e4d 100644 --- a/src/import-export/csv/gnc-csv-model.c +++ b/src/import-export/csv/gnc-csv-model.c @@ -3,6 +3,13 @@ #include "gnc-book.h" #include + +#include +#if (GO_VERSION_EPOCH == 0) && (GO_VERSION_MAJOR == 7) && (GO_VERSION_MINOR == 8) +/* For libgoffice-0.7.8, disable its internal inclusion of + so to avoid clashing symbol definitions with */ +# define GO_REGUTF8_H +#endif #include #include