Revision: 5882 http://geany.svn.sourceforge.net/geany/?rev=5882&view=rev Author: colombanw Date: 2011-08-03 15:20:26 +0000 (Wed, 03 Aug 2011)
Log Message: ----------- Only include config.h when building Geany
config.h is not distributed, and we includ it from geany.h. Even though it was only included it HAVE_CONFIG_H was defined, an Autotools based build system is likely to define it, and it becomes a problem if that very build system uses another header name than config.h.
Closes #3384026
Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c trunk/plugins/export.c trunk/plugins/filebrowser.c trunk/plugins/htmlchars.c trunk/plugins/saveactions.c trunk/plugins/splitwindow.c trunk/src/geany.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/ChangeLog 2011-08-03 15:20:26 UTC (rev 5882) @@ -1,3 +1,11 @@ +2011-08-03 Colomban Wendling <colomban(at)geany(dot)org> + + * src/geany.h, plugins/classbuilder.c, plugins/export.c, + plugins/filebrowser.c, plugins/htmlchars.c, plugins/saveactions.c, + plugins/splitwindow.c: + Only include config.h when building Geany (closes #3384026). + + 2011-07-31 Frank Lanitz frlan@frank.uvena.de
* doc/plugins.dox: @@ -5,7 +13,6 @@ HowTo as well as a hint to make usage of main_locale_init().
- 2011-07-28 Colomban Wendling <colomban(at)geany(dot)org>
* src/build.c, src/build.h, src/editor.c, src/interface.c,
Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/plugins/classbuilder.c 2011-08-03 15:20:26 UTC (rev 5882) @@ -25,6 +25,10 @@
/* Class Builder - creates source files containing a new class interface and definition. */
+#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "geanyplugin.h"
GeanyData *geany_data;
Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/plugins/export.c 2011-08-03 15:20:26 UTC (rev 5882) @@ -24,6 +24,10 @@
/* Export plugin. */
+#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <math.h>
Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/plugins/filebrowser.c 2011-08-03 15:20:26 UTC (rev 5882) @@ -24,6 +24,10 @@
/* Sidebar file browser plugin. */
+#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "geanyplugin.h" #include <string.h>
Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/plugins/htmlchars.c 2011-08-03 15:20:26 UTC (rev 5882) @@ -25,6 +25,10 @@
/* HTML Characters plugin (Inserts HTML character entities like '&') */
+#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "geanyplugin.h" #include <string.h> #include "SciLexer.h"
Modified: trunk/plugins/saveactions.c =================================================================== --- trunk/plugins/saveactions.c 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/plugins/saveactions.c 2011-08-03 15:20:26 UTC (rev 5882) @@ -23,6 +23,10 @@ */
+#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "geanyplugin.h"
#include <unistd.h>
Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/plugins/splitwindow.c 2011-08-03 15:20:26 UTC (rev 5882) @@ -24,6 +24,10 @@
/* Split Window plugin. */
+#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "geanyplugin.h" #include <string.h>
Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2011-08-01 19:31:56 UTC (rev 5881) +++ trunk/src/geany.h 2011-08-03 15:20:26 UTC (rev 5882) @@ -27,8 +27,8 @@ #ifndef GEANY_H #define GEANY_H
-#ifdef HAVE_CONFIG_H -# include <config.h> +#if defined(HAVE_CONFIG_H) && defined(GEANY_PRIVATE) +# include "config.h" #endif
#include <gtk/gtk.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.