[goffice] win32: don't export go_plugin_init and go_plugin_shutdown.



commit 0da234a9adbd3bcf3a2955c29fd7d46427e4a116
Author: Morten Welinder <terra gnome org>
Date:   Tue Oct 1 21:26:20 2013 -0400

    win32: don't export go_plugin_init and go_plugin_shutdown.

 ChangeLog           |    4 ++++
 goffice/Makefile.am |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 37f1719..ceb3f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-01  Morten Welinder  <terra gnome org>
 
+       * goffice/Makefile.am (goffice.def): Don't export go_plugin_init
+       and go_plugin_shutdown (which are prototyped because modules may
+       defined them).
+
        * goffice/utils/go-styled-object.h: Remove
        go_styled_object_is_filled which isn't implemented.
 
diff --git a/goffice/Makefile.am b/goffice/Makefile.am
index c155213..da1ffad 100644
--- a/goffice/Makefile.am
+++ b/goffice/Makefile.am
@@ -552,7 +552,7 @@ goffice.def: $(ALL_HDRS) $(top_srcdir)/tools/dumpdef.pl
        (cmp -s xgen-localdef.2 local.def || cp xgen-localdef.2 local.def)
        rm -f xgen-localdef.1 xgen-localdef.2
        echo EXPORTS > $@ && \
-       cat local.def | sort >> $@
+       grep -E -v '^(go_plugin_init|go_plugin_shutdown)$$' local.def | sort >> $@
 
 if HAVE_LIBEXE
 goffice_mslibdir = $(DESTDIR)$(libdir)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]