fix X_DISPLAY_MISSING redefined warnings when X is disabled

This is set up in config.h by configure, so avoid defining it again.
This commit is contained in:
Mike Frysinger 2014-07-28 22:59:35 -04:00
parent 560a58e617
commit cfa257c01f
4 changed files with 8 additions and 0 deletions

View File

@ -8,7 +8,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifndef X_DISPLAY_MISSING
#define X_DISPLAY_MISSING #define X_DISPLAY_MISSING
#endif
#include <Imlib2.h> #include <Imlib2.h>
#define PROG_NAME "imlib2_conv" #define PROG_NAME "imlib2_conv"

View File

@ -10,8 +10,10 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#else #else
#ifndef X_DISPLAY_MISSING
#define X_DISPLAY_MISSING #define X_DISPLAY_MISSING
#endif #endif
#endif
#include "Imlib2.h" #include "Imlib2.h"
#include "blend.h" #include "blend.h"

View File

@ -5,8 +5,10 @@
#ifdef BUILD_X11 #ifdef BUILD_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#else #else
#ifndef X_DISPLAY_MISSING
#define X_DISPLAY_MISSING #define X_DISPLAY_MISSING
#endif #endif
#endif
#include <Imlib2.h> #include <Imlib2.h>

View File

@ -13,8 +13,10 @@
#ifdef BUILD_X11 #ifdef BUILD_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#else #else
#ifndef X_DISPLAY_MISSING
#define X_DISPLAY_MISSING #define X_DISPLAY_MISSING
#endif #endif
#endif
#include "dynamic_filters.h" #include "dynamic_filters.h"
#include "image.h" #include "image.h"