Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: Frank Lanitz frank@frank.uvena.de Date: Wed, 03 Sep 2014 22:43:55 UTC Commit: b518495cab1037a878b5d450d053f9769dc3e0fe https://github.com/geany/geany-plugins/commit/b518495cab1037a878b5d450d053f9...
Log Message: ----------- Merge pull request #150 from codebrainz/geanypy-configh
GeanyPy: Fix use of `config.h` and `HAVE_CONFIG_H`
Modified Paths: -------------- geanypy/src/Makefile.am geanypy/src/geanypy-app.c geanypy/src/geanypy-dialogs.c geanypy/src/geanypy-document.c geanypy/src/geanypy-editor.c geanypy/src/geanypy-encoding.c geanypy/src/geanypy-filetypes.c geanypy/src/geanypy-highlighting.c geanypy/src/geanypy-indentprefs.c geanypy/src/geanypy-interfaceprefs.c geanypy/src/geanypy-main.c geanypy/src/geanypy-mainwidgets.c geanypy/src/geanypy-msgwindow.c geanypy/src/geanypy-navqueue.c geanypy/src/geanypy-plugin.c geanypy/src/geanypy-prefs.c geanypy/src/geanypy-project.c geanypy/src/geanypy-scinotification.c geanypy/src/geanypy-scinotifyheader.c geanypy/src/geanypy-scintilla.c geanypy/src/geanypy-search.c geanypy/src/geanypy-signalmanager.c geanypy/src/geanypy-templates.c geanypy/src/geanypy-uiutils.c geanypy/src/geanypy.h
Modified: geanypy/src/Makefile.am 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -6,8 +6,7 @@ geanyplugindir = $(libdir)/geany geanypy_la_LDFLAGS = -module -avoid-version -Wl,--export-dynamic geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ -DGEANYPY_PYTHON_DIR=""$(libdir)/geany/geanypy"" \ - -DGEANYPY_PLUGIN_DIR=""$(datadir)/geany/geanypy/plugins"" \ - -UHAVE_CONFIG_H + -DGEANYPY_PLUGIN_DIR=""$(datadir)/geany/geanypy/plugins"" geanypy_la_CFLAGS = @GEANYPY_CFLAGS@ @GMODULE_CFLAGS@ geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ @PYTHON_LDFLAGS@ \ @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \
Modified: geanypy/src/geanypy-app.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-dialogs.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-document.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-editor.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-encoding.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-filetypes.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-highlighting.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-indentprefs.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-interfaceprefs.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-main.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-mainwidgets.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-msgwindow.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-navqueue.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-plugin.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #define INCLUDE_PYGOBJECT_ONCE_FULL
#include "geanypy.h"
Modified: geanypy/src/geanypy-prefs.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-project.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-scinotification.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-scinotifyheader.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-scintilla.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-search.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy-signalmanager.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
struct _SignalManager
Modified: geanypy/src/geanypy-templates.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
/* TODO: see if the TemplatePrefs members are safe to modify. */
Modified: geanypy/src/geanypy-uiutils.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + #include "geanypy.h"
Modified: geanypy/src/geanypy.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -106,10 +106,6 @@ extern "C" { # define G_LOG_DOMAIN "GeanyPy" #endif
-#ifndef GEANYPY_WINDOWS -# include "config.h" -#endif - #include "geanypy-document.h" #include "geanypy-editor.h" #include "geanypy-encoding.h"
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).