Merge branch 'uli42-pr/fix_wrap_macros' into 3.6.x

Attributes GH PR #944: https://github.com/ArcticaProject/nx-libs/pull/944

Merge branch 'uli42-pr/fix_wrap_macros' into 3.6.x
bc68b4aa · Mike Gabriel · 67330d9e · d1a967f3 · bc68b4aa
Unverified Commit bc68b4aa authored Oct 17, 2020 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

randr.c nx-X11/programs/Xserver/randr/randr.c +3 -3

No files found.
--- a/nx-X11/programs/Xserver/randr/randr.c
+++ b/nx-X11/programs/Xserver/randr/randr.c
@@ -69,12 +69,12 @@
 static int RRNScreens;

 #define wrap(priv,real,mem,func) {\
-    ((ScreenPtr)priv)->mem = ((ScreenPtr)real)->mem; \
-    ((ScreenPtr)real)->mem = func; \
+    priv->mem = real->mem; \
+    real->mem = func; \
 }

 #define unwrap(priv,real,mem) {\
-    ((ScreenPtr)real)->mem = ((ScreenPtr)priv)->mem; \
+    real->mem = priv->mem; \
 }

 static int ProcRRDispatch(ClientPtr pClient);