From c77bcb9f7fcfacb4891a2bab10c8f1c72aab8293 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 15 May 2024 19:53:47 +0200
Subject: [PATCH] Xext: securitysrv.h: drop hacks for including secur.h

The secur.h doesn't need the symbols defined here (eg. Status or Display)
anymore, so no need to keep it around anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1550>
---
 Xext/securitysrv.h | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Xext/securitysrv.h b/Xext/securitysrv.h
index 8904242d6..f000e732f 100644
--- a/Xext/securitysrv.h
+++ b/Xext/securitysrv.h
@@ -30,27 +30,8 @@ from The Open Group.
 #ifndef _SECURITY_SRV_H
 #define _SECURITY_SRV_H
 
-/* Allow client side portions of <X11/extensions/security.h> to compile */
-#ifndef Status
-#define Status int
-#define NEED_UNDEF_Status
-#endif
-#ifndef Display
-#define Display void
-#define NEED_UNDEF_Display
-#endif
-
 #include <X11/extensions/secur.h>
 
-#ifdef NEED_UNDEF_Status
-#undef Status
-#undef NEED_UNDEF_Status
-#endif
-#ifdef NEED_UNDEF_Display
-#undef Display
-#undef NEED_UNDEF_Display
-#endif
-
 #include "input.h"              /* for DeviceIntPtr */
 #include "property.h"           /* for PropertyPtr */
 #include "pixmap.h"             /* for DrawablePtr */