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 git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5882 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
a9f4dcfbbb
commit
5bad25e2ab
@ -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>
|
2011-07-31 Frank Lanitz <frlan@frank.uvena.de>
|
||||||
|
|
||||||
* doc/plugins.dox:
|
* doc/plugins.dox:
|
||||||
@ -5,7 +13,6 @@
|
|||||||
HowTo as well as a hint to make usage of main_locale_init().
|
HowTo as well as a hint to make usage of main_locale_init().
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
2011-07-28 Colomban Wendling <colomban(at)geany(dot)org>
|
2011-07-28 Colomban Wendling <colomban(at)geany(dot)org>
|
||||||
|
|
||||||
* src/build.c, src/build.h, src/editor.c, src/interface.c,
|
* src/build.c, src/build.h, src/editor.c, src/interface.c,
|
||||||
|
@ -25,6 +25,10 @@
|
|||||||
|
|
||||||
/* Class Builder - creates source files containing a new class interface and definition. */
|
/* Class Builder - creates source files containing a new class interface and definition. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "geanyplugin.h"
|
#include "geanyplugin.h"
|
||||||
|
|
||||||
GeanyData *geany_data;
|
GeanyData *geany_data;
|
||||||
|
@ -24,6 +24,10 @@
|
|||||||
|
|
||||||
/* Export plugin. */
|
/* Export plugin. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
@ -24,6 +24,10 @@
|
|||||||
|
|
||||||
/* Sidebar file browser plugin. */
|
/* Sidebar file browser plugin. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "geanyplugin.h"
|
#include "geanyplugin.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -25,6 +25,10 @@
|
|||||||
|
|
||||||
/* HTML Characters plugin (Inserts HTML character entities like '&') */
|
/* HTML Characters plugin (Inserts HTML character entities like '&') */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "geanyplugin.h"
|
#include "geanyplugin.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "SciLexer.h"
|
#include "SciLexer.h"
|
||||||
|
@ -23,6 +23,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "geanyplugin.h"
|
#include "geanyplugin.h"
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -24,6 +24,10 @@
|
|||||||
|
|
||||||
/* Split Window plugin. */
|
/* Split Window plugin. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "geanyplugin.h"
|
#include "geanyplugin.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -27,8 +27,8 @@
|
|||||||
#ifndef GEANY_H
|
#ifndef GEANY_H
|
||||||
#define GEANY_H
|
#define GEANY_H
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#if defined(HAVE_CONFIG_H) && defined(GEANY_PRIVATE)
|
||||||
# include <config.h>
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user