From 5536470a07f2e528948c45ea6562254c8a1dff1a Mon Sep 17 00:00:00 2001
From: Jonathan Wendt <wendt@vr.rwth-aachen.de>
Date: Thu, 13 Dec 2018 09:46:22 +0100
Subject: [PATCH] Remove problematic X11 defines

---
 ThirdParty/X11/Include/X11/X.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ThirdParty/X11/Include/X11/X.h b/ThirdParty/X11/Include/X11/X.h
index 5cf695d..99fe0e1 100644
--- a/ThirdParty/X11/Include/X11/X.h
+++ b/ThirdParty/X11/Include/X11/X.h
@@ -111,10 +111,6 @@ typedef unsigned char KeyCode;
  * RESERVED RESOURCE AND CONSTANT DEFINITIONS
  *****************************************************************/
 
-#ifndef None
-#define None                 0L	/* universal null resource or null atom */
-#endif
-
 #define ParentRelative       1L	/* background pixmap in CreateWindow
 				    and ChangeWindowAttributes */
 
@@ -136,8 +132,6 @@ typedef unsigned char KeyCode;
 
 #define AllTemporary         0L	/* special Resource ID passed to KillClient */
 
-#define CurrentTime          0L	/* special Time */
-
 #define NoSymbol	     0L	/* special KeySym */
 
 /***************************************************************** 
-- 
GitLab