Revision: 4577 http://geany.svn.sourceforge.net/geany/?rev=4577&view=rev Author: ntrel Date: 2010-01-28 16:30:20 +0000 (Thu, 28 Jan 2010)
Log Message: ----------- Backport: Don't build pluginutils.o if HAVE_PLUGINS is not defined.
Modified Paths: -------------- branches/geany-0.18.1/ChangeLog branches/geany-0.18.1/src/pluginutils.c branches/geany-0.18.1/src/pluginutils.h
Modified: branches/geany-0.18.1/ChangeLog =================================================================== --- branches/geany-0.18.1/ChangeLog 2010-01-28 16:24:42 UTC (rev 4576) +++ branches/geany-0.18.1/ChangeLog 2010-01-28 16:30:20 UTC (rev 4577) @@ -3,6 +3,8 @@ * configure.in: Use AC_PATH_PROG instead of which for portability (patch by Erik Southworth, thanks). + * src/pluginutils.c, src/pluginutils.h: + Don't build pluginutils.o if HAVE_PLUGINS is not defined.
2009-09-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/geany-0.18.1/src/pluginutils.c =================================================================== --- branches/geany-0.18.1/src/pluginutils.c 2010-01-28 16:24:42 UTC (rev 4576) +++ branches/geany-0.18.1/src/pluginutils.c 2010-01-28 16:30:20 UTC (rev 4577) @@ -27,6 +27,8 @@ * These functions all take the @ref geany_plugin symbol as their first argument. */
#include "geany.h" +#ifdef HAVE_PLUGINS + #include "pluginutils.h" #include "pluginprivate.h"
@@ -125,3 +127,4 @@ }
+#endif
Modified: branches/geany-0.18.1/src/pluginutils.h =================================================================== --- branches/geany-0.18.1/src/pluginutils.h 2010-01-28 16:24:42 UTC (rev 4576) +++ branches/geany-0.18.1/src/pluginutils.h 2010-01-28 16:30:20 UTC (rev 4577) @@ -26,8 +26,10 @@ #ifndef PLUGINUTILS_H #define PLUGINUTILS_H
-#include "plugindata.h" +#ifdef HAVE_PLUGINS
+#include "plugindata.h" /* GeanyPlugin */ + void plugin_add_toolbar_item(GeanyPlugin *plugin, GtkToolItem *item);
void plugin_module_make_resident(GeanyPlugin *plugin); @@ -36,4 +38,5 @@ GObject *object, gchar *signal_name, gboolean after, GCallback callback, gpointer user_data);
+#endif /* HAVE_PLUGINS */ #endif /* PLUGINUTILS_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.