From beb08eb751fa8e1f72042f263316ab5e5ddb596d Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Wed, 10 Nov 2021 00:54:13 -0500
Subject: New upstream version 2.4.0+dfsg.

---
 src/lib/platform/IXWindowsImpl.h | 58 +++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

(limited to 'src/lib/platform/IXWindowsImpl.h')

diff --git a/src/lib/platform/IXWindowsImpl.h b/src/lib/platform/IXWindowsImpl.h
index ddcaf2f..37c59b2 100644
--- a/src/lib/platform/IXWindowsImpl.h
+++ b/src/lib/platform/IXWindowsImpl.h
@@ -3,39 +3,31 @@
 
 #include "config.h"
 
-#if X_DISPLAY_MISSING
-#	error X11 is required to build barrier
-#else
-#	include <X11/X.h>
-#	include <X11/Xutil.h>
-#	define XK_MISCELLANY
-#	define XK_XKB_KEYS
-#	include <X11/keysymdef.h>
-#	if HAVE_X11_EXTENSIONS_DPMS_H
-        extern "C" {
-#		include <X11/extensions/dpms.h>
-        }
-#	endif
-#	if HAVE_X11_EXTENSIONS_XTEST_H
-#		include <X11/extensions/XTest.h>
-#	else
-#		error The XTest extension is required to build barrier
-#	endif
-#	if HAVE_X11_EXTENSIONS_XINERAMA_H
-        // Xinerama.h may lack extern "C" for inclusion by C++
-        extern "C" {
-#		include <X11/extensions/Xinerama.h>
-        }
-#	endif
-#	if HAVE_X11_EXTENSIONS_XRANDR_H
-#		include <X11/extensions/Xrandr.h>
-#	endif
-#	if HAVE_XKB_EXTENSION
-#		include <X11/XKBlib.h>
-#	endif
-#	ifdef HAVE_XI2
-#		include <X11/extensions/XInput2.h>
-#	endif
+#include <X11/X.h>
+#include <X11/Xutil.h>
+#define XK_MISCELLANY
+#define XK_XKB_KEYS
+#include <X11/keysymdef.h>
+#if HAVE_X11_EXTENSIONS_DPMS_H
+     extern "C" {
+#	include <X11/extensions/dpms.h>
+     }
+#endif
+#include <X11/extensions/XTest.h>
+#if HAVE_X11_EXTENSIONS_XINERAMA_H
+     // Xinerama.h may lack extern "C" for inclusion by C++
+     extern "C" {
+#	include <X11/extensions/Xinerama.h>
+     }
+#endif
+#if HAVE_X11_EXTENSIONS_XRANDR_H
+#	include <X11/extensions/Xrandr.h>
+#endif
+#if HAVE_XKB_EXTENSION
+#	include <X11/XKBlib.h>
+#endif
+#ifdef HAVE_XI2
+#	include <X11/extensions/XInput2.h>
 #endif
 
 class IXWindowsImpl {
-- 
cgit v1.2.3