Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: Frank Lanitz frank@frank.uvena.de Date: Thu, 02 Jun 2016 06:48:17 UTC Commit: 7c74763c9b2778e789b5163201cf8fa0b5bb9d93 https://github.com/geany/geany-plugins/commit/7c74763c9b2778e789b5163201cf8f...

Log Message: ----------- Merge pull request #431 from elextr/patch-1

Copy fix from upstream

Modified Paths: -------------- geanypy/src/geanypy.h

Modified: geanypy/src/geanypy.h 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -100,6 +100,9 @@ extern "C" { #include <Scintilla.h> #include <ScintillaWidget.h>

+/* Expansion of this Scintilla macro causes name clashes. */ +#undef NotifyHeader + #include <geanyplugin.h>

#ifndef G_LOG_DOMAIN

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).