From cfa257c01f0daacdf37343e31aec9e2032a8045d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 28 Jul 2014 22:59:35 -0400
Subject: [PATCH] fix X_DISPLAY_MISSING redefined warnings when X is disabled

This is set up in config.h by configure, so avoid defining it again.
---
 src/bin/imlib2_conv.c | 2 ++
 src/lib/api.c         | 2 ++
 src/lib/image.h       | 2 ++
 src/lib/script.c      | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/bin/imlib2_conv.c b/src/bin/imlib2_conv.c
index 1b05b1f..1c46d0c 100644
--- a/src/bin/imlib2_conv.c
+++ b/src/bin/imlib2_conv.c
@@ -8,7 +8,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifndef X_DISPLAY_MISSING
 #define X_DISPLAY_MISSING
+#endif
 #include <Imlib2.h>
 
 #define PROG_NAME "imlib2_conv"
diff --git a/src/lib/api.c b/src/lib/api.c
index cbd4e48..3bb09ea 100644
--- a/src/lib/api.c
+++ b/src/lib/api.c
@@ -10,8 +10,10 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 #else
+#ifndef X_DISPLAY_MISSING
 #define X_DISPLAY_MISSING
 #endif
+#endif
 
 #include "Imlib2.h"
 #include "blend.h"
diff --git a/src/lib/image.h b/src/lib/image.h
index f125e12..da82576 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -5,8 +5,10 @@
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
 #else
+#ifndef X_DISPLAY_MISSING
 #define X_DISPLAY_MISSING
 #endif
+#endif
 
 #include <Imlib2.h>
 
diff --git a/src/lib/script.c b/src/lib/script.c
index f3a33b0..b65912f 100644
--- a/src/lib/script.c
+++ b/src/lib/script.c
@@ -13,8 +13,10 @@
 #ifdef BUILD_X11
 #include <X11/Xlib.h>
 #else
+#ifndef X_DISPLAY_MISSING
 #define X_DISPLAY_MISSING
 #endif
+#endif
 
 #include "dynamic_filters.h"
 #include "image.h"