From 98f5a13059161c5f49cb1a614966a3df85ab6f60 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 23 Apr 2011 18:58:43 +0000 Subject: [PATCH] Win32: Undefine G_MODULE_EXPORT in our internal libraries. Please do not use it. The rest of gnucash relies on *everything* being exported. This is done by mingw's linker, but only if no symbol at all was marked as being exported. As soon as at least one symbol is manually marked as export, nothing except those marked symbols are exported, which will immediately lead to "unresolved symbols" in the win32 build. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20593 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/dialog-account.c | 10 ++++++++++ src/gnome/assistant-hierarchy.c | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index 5bfd04b8ec..f263f66661 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -56,6 +56,16 @@ #define GCONF_SECTION "dialogs/account" #define DEFAULT_COLOR "#ededececebeb" +#ifdef G_MODULE_EXPORT +/* No separate marking of functions as "DLL export", please: The rest + * of gnucash relies on *everything* being exported. As soon as at + * least one function is manually marked as export, nothing except + * those marked functions are exported, which will break the build on + * Windows. */ +# undef G_MODULE_EXPORT +# define G_MODULE_EXPORT +#endif + enum account_cols { ACCOUNT_COL_FULLNAME = 0, diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index d52959574e..1ee424f2f8 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -57,6 +57,16 @@ static QofLogModule log_module = GNC_MOD_IMPORT; #define GCONF_SECTION "dialogs/new_hierarchy" +#ifdef G_MODULE_EXPORT +/* No separate marking of functions as "DLL export", please: The rest + * of gnucash relies on *everything* being exported. As soon as at + * least one function is manually marked as export, nothing except + * those marked functions are exported, which will break the build on + * Windows. */ +# undef G_MODULE_EXPORT +# define G_MODULE_EXPORT +#endif + typedef enum { COL_CHECKED,