From 7afa753652d62d3714e40e5d7ca2809461cfe8ad Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 26 Sep 2025 15:38:06 +0200
Subject: [PATCH] Xext: drop PanoramiXGCKey and PanoramiXScreenKey macros

We can directly use the actual fields, no need for these extra macros.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/panoramiX.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 389983ca49..00d3baa5e5 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -107,12 +107,8 @@ int (*SavedProcVector[256]) (ClientPtr client) = {
 NULL,};
 
 static DevPrivateKeyRec PanoramiXGCKeyRec;
-
-#define PanoramiXGCKey (&PanoramiXGCKeyRec)
 static DevPrivateKeyRec PanoramiXScreenKeyRec;
 
-#define PanoramiXScreenKey (&PanoramiXScreenKeyRec)
-
 typedef struct {
     DDXPointRec clipOrg;
     DDXPointRec patOrg;
@@ -138,7 +134,7 @@ static const GCFuncs XineramaGCFuncs = {
 
 #define Xinerama_GC_FUNC_PROLOGUE(pGC)\
     PanoramiXGCPtr  pGCPriv = (PanoramiXGCPtr) \
-	dixLookupPrivate(&(pGC)->devPrivates, PanoramiXGCKey); \
+	dixLookupPrivate(&(pGC)->devPrivates, &PanoramiXGCKeyRec); \
     (pGC)->funcs = pGCPriv->wrapFuncs;
 
 #define Xinerama_GC_FUNC_EPILOGUE(pGC)\
@@ -150,7 +146,7 @@ static void XineramaCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void *
     dixScreenUnhookClose(pScreen, XineramaCloseScreen);
 
     PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr)
-        dixLookupPrivate(&pScreen->devPrivates, PanoramiXScreenKey);
+        dixLookupPrivate(&pScreen->devPrivates, &PanoramiXScreenKeyRec);
 
     if (!pScreenPriv)
         return;
@@ -161,7 +157,7 @@ static void XineramaCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void *
         RegionUninit(&PanoramiXScreenRegion);
 
     free(pScreenPriv);
-    dixSetPrivate(&pScreen->devPrivates, PanoramiXScreenKey, NULL);
+    dixSetPrivate(&pScreen->devPrivates, &PanoramiXScreenKeyRec, NULL);
 }
 
 static Bool
@@ -169,13 +165,13 @@ XineramaCreateGC(GCPtr pGC)
 {
     ScreenPtr pScreen = pGC->pScreen;
     PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr)
-        dixLookupPrivate(&pScreen->devPrivates, PanoramiXScreenKey);
+        dixLookupPrivate(&pScreen->devPrivates, &PanoramiXScreenKeyRec);
     Bool ret;
 
     pScreen->CreateGC = pScreenPriv->CreateGC;
     if ((ret = (*pScreen->CreateGC) (pGC))) {
         PanoramiXGCPtr pGCPriv = (PanoramiXGCPtr)
-            dixLookupPrivate(&pGC->devPrivates, PanoramiXGCKey);
+            dixLookupPrivate(&pGC->devPrivates, &PanoramiXGCKeyRec);
 
         pGCPriv->wrapFuncs = pGC->funcs;
         pGC->funcs = &XineramaGCFuncs;
@@ -275,7 +271,7 @@ static void
 XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
 {
     PanoramiXGCPtr pSrcPriv = (PanoramiXGCPtr)
-        dixLookupPrivate(&pGCSrc->devPrivates, PanoramiXGCKey);
+        dixLookupPrivate(&pGCSrc->devPrivates, &PanoramiXGCKeyRec);
 
     Xinerama_GC_FUNC_PROLOGUE(pGCDst);
 
@@ -463,7 +459,7 @@ PanoramiXExtensionInit(void)
          */
         XINERAMA_FOR_EACH_SCREEN_BACKWARD({
             PanoramiXScreenPtr pScreenPriv = calloc(1, sizeof(PanoramiXScreenRec));
-            dixSetPrivate(&walkScreen->devPrivates, PanoramiXScreenKey,
+            dixSetPrivate(&walkScreen->devPrivates, &PanoramiXScreenKeyRec,
                           pScreenPriv);
             if (!pScreenPriv) {
                 noPanoramiXExtension = TRUE;