Removed X_DISPLAY_MISSING.
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index f9cf96e..52ce5dc 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -47,17 +47,16 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
+#include <X11/Xatom.h>
+
+#include "ts_xlib.h"
#include <errno.h>
-#include <X11/Xatom.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-#include "ts_xlib.h"
-
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
@@ -1239,5 +1238,3 @@
else prop = &(*prop)->next;
}
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 3e63b9e..bcb8fd2 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -7,17 +7,15 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xatom.h>
#include <X11/keysym.h>
+
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
#ifdef HAVE_LIBXXSHM
#include "ts_xshm.h"
#endif
-
#ifdef HAVE_LIBXXF86DGA2
#include "ts_xf86dga2.h"
#endif
@@ -2183,5 +2181,3 @@
}
#endif /* defined(HAVE_LIBXXSHM) */
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/init.c b/windows/x11drv/init.c
index 37616fe..e840d68 100644
--- a/windows/x11drv/init.c
+++ b/windows/x11drv/init.c
@@ -4,10 +4,6 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "config.h"
-
-#ifndef X_DISPLAY_MISSING
-
#include "clipboard.h"
#include "monitor.h"
#include "user.h"
@@ -46,6 +42,4 @@
X11DRV_WND_IsSelfClipping
};
-#endif /* !defined(X_DISPLAY_MISSING) */
-
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index 29d6b98..951a008 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -11,16 +11,16 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
-#include <ctype.h>
-#include <string.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
+
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
+#include <ctype.h>
+#include <string.h>
+
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
@@ -1567,6 +1567,3 @@
TSXChangeKeyboardControl(display, X_mask, &xkc);
}
-
-#endif /* !defined(X_DISPLAY_MISSING) */
-
diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c
index 9a7a9d5..1a09917 100644
--- a/windows/x11drv/mouse.c
+++ b/windows/x11drv/mouse.c
@@ -6,8 +6,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include "ts_xlib.h"
#include "callback.h"
@@ -272,6 +270,3 @@
GetTickCount(),
0);
}
-
-
-#endif /* !defined(X_DISPLAY_MISSING) */
diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index a991f3f..c8272ba 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -8,14 +8,14 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xatom.h>
+
#include "ts_xlib.h"
#include "ts_xutil.h"
#include <stdlib.h>
#include <string.h>
+
#include "bitmap.h"
#include "color.h"
#include "debugtools.h"
@@ -882,4 +882,4 @@
display,win,kwmDockWindow,kwmDockWindow,32,PropModeReplace,(char*)&data,1
);
}
-#endif /* !defined(X_DISPLAY_MISSING) */
+
