[PATCH wayland] scanner: Move PROGRAM_NAME define
Derek Foreman
derekf at osg.samsung.com
Tue Jun 7 15:21:41 UTC 2016
On 07/06/16 10:19 AM, Yong Bakos wrote:
> From: Yong Bakos <ybakos at humanoriented.com>
>
> PROGRAM_NAME was defined within the if block of HAVE_LIBXML, causing a
> compilation failure when libxml is not present.
>
> Move the define of PROGRAM_NAME out of the if block.
>
> Signed-off-by: Yong Bakos <ybakos at humanoriented.com>
Thanks for the quick fix.
Reviewed-by: Derek Foreman <derekf at osg.samsung.com>
I'll land it immediately.
> ---
> src/scanner.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/scanner.c b/src/scanner.c
> index 705473b..4708cae 100644
> --- a/src/scanner.c
> +++ b/src/scanner.c
> @@ -42,8 +42,6 @@
> #if HAVE_LIBXML
> #include <libxml/parser.h>
>
> -#define PROGRAM_NAME "wayland-scanner"
> -
> /* Embedded wayland.dtd file, see dtddata.S */
> extern char DTD_DATA_begin;
> extern int DTD_DATA_len;
> @@ -51,6 +49,8 @@ extern int DTD_DATA_len;
>
> #include "wayland-util.h"
>
> +#define PROGRAM_NAME "wayland-scanner"
> +
> enum side {
> CLIENT,
> SERVER,
>
More information about the wayland-devel
mailing list