Unverified Commit bc68b4aa authored by Mike Gabriel's avatar Mike Gabriel

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

parents 67330d9e d1a967f3
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
static int RRNScreens; static int RRNScreens;
#define wrap(priv,real,mem,func) {\ #define wrap(priv,real,mem,func) {\
((ScreenPtr)priv)->mem = ((ScreenPtr)real)->mem; \ priv->mem = real->mem; \
((ScreenPtr)real)->mem = func; \ real->mem = func; \
} }
#define unwrap(priv,real,mem) {\ #define unwrap(priv,real,mem) {\
((ScreenPtr)real)->mem = ((ScreenPtr)priv)->mem; \ real->mem = priv->mem; \
} }
static int ProcRRDispatch(ClientPtr pClient); static int ProcRRDispatch(ClientPtr pClient);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment