1 From 7fb1a4468b9d0314cffcdd1fd2a156e6f8c5101b Mon Sep 17 00:00:00 2001
2 From: Mike Frysinger <vapier@gentoo.org>
3 Date: Mon, 28 Jul 2014 22:59:35 -0400
4 Subject: [PATCH 4/6] fix X_DISPLAY_MISSING redefined warnings when X is
7 This is set up in config.h by configure, so avoid defining it again.
9 src/bin/imlib2_conv.c | 2 ++
11 src/lib/image.h | 2 ++
12 src/lib/script.c | 2 ++
13 4 files changed, 8 insertions(+)
15 diff --git a/src/bin/imlib2_conv.c b/src/bin/imlib2_conv.c
16 index 1b05b1f..1c46d0c 100644
17 --- a/src/bin/imlib2_conv.c
18 +++ b/src/bin/imlib2_conv.c
23 +#ifndef X_DISPLAY_MISSING
24 #define X_DISPLAY_MISSING
28 #define PROG_NAME "imlib2_conv"
29 diff --git a/src/lib/api.c b/src/lib/api.c
30 index e29eaf0..178d2ca 100644
34 #include <X11/Xutil.h>
35 #include <X11/extensions/shape.h>
37 +#ifndef X_DISPLAY_MISSING
38 #define X_DISPLAY_MISSING
44 diff --git a/src/lib/image.h b/src/lib/image.h
45 index eef59d2..52dde9d 100644
50 # include <X11/Xlib.h>
52 +#ifndef X_DISPLAY_MISSING
53 # define X_DISPLAY_MISSING
58 diff --git a/src/lib/script.c b/src/lib/script.c
59 index 55ebd4e..7c974c0 100644
60 --- a/src/lib/script.c
61 +++ b/src/lib/script.c
66 +#ifndef X_DISPLAY_MISSING
67 #define X_DISPLAY_MISSING
72 #include "dynamic_filters.h"