On 13-02-28 08:14 AM, Lucas Vieites wrote:
Hi, I use the default (without prefix). With today's nightly I don't get this error anymore, but I'm having trouble when the build gets to the markdown plugin.
I don't know much about Waf but I guess it's pulling in the wrong "config.h" file. Attached is a patch that renames Discount library's "config.h" so it doesn't clash with Geany-Plugins one.
@FraLan I didn't make a pull request for this because Discount might have to come out of the markdown plugin due to potential licensing issues, but feel free to apply it for in the meantime to allow people to continue to build with Waf. Changing the library used by the plugin shouldn't affect translations in any way.
Cheers, Matthew Brush
>From 3f42627f73ea5b000619bf7d8eb00c3722499c79 Mon Sep 17 00:00:00 2001 From: Matthew Brush <[email protected]> Date: Thu, 28 Feb 2013 12:50:17 -0800 Subject: [PATCH] Rename Discount's config.h to discount-config.h Avoids a clash with Geany-Plugins config.h when using Waf. --- markdown/discount/Makefile.am | 2 +- markdown/discount/amalloc.h | 2 +- markdown/discount/basename.c | 2 +- markdown/discount/config.h | 35 ----------------------------------- markdown/discount/css.c | 2 +- markdown/discount/discount-config.h | 35 +++++++++++++++++++++++++++++++++++ markdown/discount/docheader.c | 2 +- markdown/discount/emmatch.c | 2 +- markdown/discount/generate.c | 2 +- markdown/discount/markdown.c | 2 +- markdown/discount/mkdio.c | 2 +- markdown/discount/resource.c | 2 +- markdown/discount/setup.c | 2 +- markdown/discount/toc.c | 2 +- markdown/discount/version.c | 2 +- markdown/discount/xml.c | 2 +- markdown/discount/xmlpage.c | 2 +- 17 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 markdown/discount/config.h create mode 100644 markdown/discount/discount-config.h diff --git a/markdown/discount/Makefile.am b/markdown/discount/Makefile.am index 100c7eb..56badc5 100644 --- a/markdown/discount/Makefile.am +++ b/markdown/discount/Makefile.am @@ -5,7 +5,7 @@ libdiscount_la_SOURCES = \ amalloc.h \ blocktags \ basename.c \ - config.h \ + discount-config.h \ Csio.c \ css.c \ cstring.h \ diff --git a/markdown/discount/amalloc.h b/markdown/discount/amalloc.h index 43ca985..1485321 100644 --- a/markdown/discount/amalloc.h +++ b/markdown/discount/amalloc.h @@ -5,7 +5,7 @@ #ifndef AMALLOC_D #define AMALLOC_D -#include "config.h" +#include "discount-config.h" #ifdef USE_AMALLOC diff --git a/markdown/discount/basename.c b/markdown/discount/basename.c index 237022a..f968d27 100644 --- a/markdown/discount/basename.c +++ b/markdown/discount/basename.c @@ -5,7 +5,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/markdown/discount/config.h b/markdown/discount/config.h deleted file mode 100644 index da2c292..0000000 --- a/markdown/discount/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * In the upstream Discount tree, this file is auto-generated, for the - * Geany plugin it's not. - */ -#ifndef DISCOUNT_CONFIG_H -#define DISCOUNT_CONFIG_H 1 - -#include <glib.h> - -G_BEGIN_DECLS - -#define OS_LINUX G_OS_UNIX -#define USE_DISCOUNT_DL 0 -#define DWORD guint32 -#define WORD guint16 -#define BYTE guint8 -#define HAVE_BASENAME 0 -#define HAVE_LIBGEN_H 0 -#define HAVE_PWD_H 0 -#define HAVE_GETPWUID 0 -#define HAVE_SRANDOM 0 -#define INITRNG(x) srandom((unsigned int)x) -#define HAVE_BZERO 0 -#define HAVE_RANDOM 0 -#define COINTOSS() (random()&1) -#define HAVE_STRCASECMP 0 -#define HAVE_STRNCASECMP 0 -#define HAVE_FCHDIR 0 -#define TABSTOP 4 -#define HAVE_MALLOC_H 0 -#define VERSION "2.1.3" - -G_END_DECLS - -#endif /* DISCOUNT_CONFIG_H */ diff --git a/markdown/discount/css.c b/markdown/discount/css.c index 3eb30b3..57c1aba 100644 --- a/markdown/discount/css.c +++ b/markdown/discount/css.c @@ -11,7 +11,7 @@ #include <time.h> #include <ctype.h> -#include "config.h" +#include "discount-config.h" #include "cstring.h" #include "markdown.h" diff --git a/markdown/discount/discount-config.h b/markdown/discount/discount-config.h new file mode 100644 index 0000000..da2c292 --- /dev/null +++ b/markdown/discount/discount-config.h @@ -0,0 +1,35 @@ +/* + * In the upstream Discount tree, this file is auto-generated, for the + * Geany plugin it's not. + */ +#ifndef DISCOUNT_CONFIG_H +#define DISCOUNT_CONFIG_H 1 + +#include <glib.h> + +G_BEGIN_DECLS + +#define OS_LINUX G_OS_UNIX +#define USE_DISCOUNT_DL 0 +#define DWORD guint32 +#define WORD guint16 +#define BYTE guint8 +#define HAVE_BASENAME 0 +#define HAVE_LIBGEN_H 0 +#define HAVE_PWD_H 0 +#define HAVE_GETPWUID 0 +#define HAVE_SRANDOM 0 +#define INITRNG(x) srandom((unsigned int)x) +#define HAVE_BZERO 0 +#define HAVE_RANDOM 0 +#define COINTOSS() (random()&1) +#define HAVE_STRCASECMP 0 +#define HAVE_STRNCASECMP 0 +#define HAVE_FCHDIR 0 +#define TABSTOP 4 +#define HAVE_MALLOC_H 0 +#define VERSION "2.1.3" + +G_END_DECLS + +#endif /* DISCOUNT_CONFIG_H */ diff --git a/markdown/discount/docheader.c b/markdown/discount/docheader.c index 073f6da..7a95442 100644 --- a/markdown/discount/docheader.c +++ b/markdown/discount/docheader.c @@ -5,7 +5,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/markdown/discount/emmatch.c b/markdown/discount/emmatch.c index 4f4eabd..9984914 100644 --- a/markdown/discount/emmatch.c +++ b/markdown/discount/emmatch.c @@ -11,7 +11,7 @@ #include <time.h> #include <ctype.h> -#include "config.h" +#include "discount-config.h" #include "cstring.h" #include "markdown.h" diff --git a/markdown/discount/generate.c b/markdown/discount/generate.c index 4fa1d1c..de21410 100644 --- a/markdown/discount/generate.c +++ b/markdown/discount/generate.c @@ -11,7 +11,7 @@ #include <time.h> #include <ctype.h> -#include "config.h" +#include "discount-config.h" #include "cstring.h" #include "markdown.h" diff --git a/markdown/discount/markdown.c b/markdown/discount/markdown.c index b55d975..6218488 100644 --- a/markdown/discount/markdown.c +++ b/markdown/discount/markdown.c @@ -4,7 +4,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <string.h> diff --git a/markdown/discount/mkdio.c b/markdown/discount/mkdio.c index 171c118..d931b30 100644 --- a/markdown/discount/mkdio.c +++ b/markdown/discount/mkdio.c @@ -5,7 +5,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/markdown/discount/resource.c b/markdown/discount/resource.c index c8611b1..9b29e75 100644 --- a/markdown/discount/resource.c +++ b/markdown/discount/resource.c @@ -11,7 +11,7 @@ #include <time.h> #include <ctype.h> -#include "config.h" +#include "discount-config.h" #include "cstring.h" #include "markdown.h" diff --git a/markdown/discount/setup.c b/markdown/discount/setup.c index 988a6aa..d555991 100644 --- a/markdown/discount/setup.c +++ b/markdown/discount/setup.c @@ -4,7 +4,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <string.h> diff --git a/markdown/discount/toc.c b/markdown/discount/toc.c index 8037e36..75ffe1a 100644 --- a/markdown/discount/toc.c +++ b/markdown/discount/toc.c @@ -6,7 +6,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/markdown/discount/version.c b/markdown/discount/version.c index 8e48410..ac919db 100644 --- a/markdown/discount/version.c +++ b/markdown/discount/version.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "discount-config.h" char markdown_version[] = VERSION #if 4 != 4 diff --git a/markdown/discount/xml.c b/markdown/discount/xml.c index 5e58389..266917f 100644 --- a/markdown/discount/xml.c +++ b/markdown/discount/xml.c @@ -11,7 +11,7 @@ #include <time.h> #include <ctype.h> -#include "config.h" +#include "discount-config.h" #include "cstring.h" #include "markdown.h" diff --git a/markdown/discount/xmlpage.c b/markdown/discount/xmlpage.c index 96ed2b7..87bd7fe 100644 --- a/markdown/discount/xmlpage.c +++ b/markdown/discount/xmlpage.c @@ -5,7 +5,7 @@ * The redistribution terms are provided in the COPYRIGHT file that must * be distributed with this source code. */ -#include "config.h" +#include "discount-config.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> -- 1.7.10.4
_______________________________________________ I18n mailing list [email protected] https://lists.geany.org/cgi-bin/mailman/listinfo/i18n
