diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-17 21:49:35 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-17 21:49:35 +0200 |
commit | bc68b4aad96fa1819842b43c95715d5f2598546d (patch) | |
tree | 699e7cfae05945731de8fb335ab7887a3c2ff77d | |
parent | 67330d9ea185de0f08731c684363078e349b1845 (diff) | |
parent | d1a967f3aefcffc6babeb25fccc912c0bfdb9fe3 (diff) | |
download | nx-libs-bc68b4aad96fa1819842b43c95715d5f2598546d.tar.gz nx-libs-bc68b4aad96fa1819842b43c95715d5f2598546d.tar.bz2 nx-libs-bc68b4aad96fa1819842b43c95715d5f2598546d.zip |
Merge branch 'uli42-pr/fix_wrap_macros' into 3.6.x
Attributes GH PR #944: https://github.com/ArcticaProject/nx-libs/pull/944
-rw-r--r-- | nx-X11/programs/Xserver/randr/randr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c index c742cf6e0..f8401a5cd 100644 --- 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); |