diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:38:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:38:01 +0200 |
| commit | 9df153668423af868d0df739188a772fbc3356c6 (patch) | |
| tree | 72ba967c6643be796eba038ff3c6883048454635 /nx-X11/programs/Xserver/hw/nxagent | |
| parent | 9c1275f58b5e19f5495a83ef84afb023991b49d9 (diff) | |
| parent | b7d7ff3e4d1be2d6b8ca0895cf9694dddcffa646 (diff) | |
| download | nx-libs-9df153668423af868d0df739188a772fbc3356c6.tar.gz nx-libs-9df153668423af868d0df739188a772fbc3356c6.tar.bz2 nx-libs-9df153668423af868d0df739188a772fbc3356c6.zip | |
Merge branch 'uli42-pr/run_xinerama_without_debug_output' into 3.6.x
Attributes GH PR #156: https://github.com/ArcticaProject/nx-libs/pull/156
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 40b1e5222..de8c97532 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -104,10 +104,10 @@ is" without express or implied warranty. * Set here the required log level. */ -#define PANIC -#define WARNING -#define TEST -#define DEBUG +#undef PANIC +#undef WARNING +#undef TEST +#undef DEBUG #undef WATCH #undef DUMP @@ -3799,7 +3799,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) } #else /* we are not interested in the return code */ - RRGetInfo(pScreen); + RRGetInfo(pScreen, FALSE); #endif #ifndef NXAGENT_RANDR_XINERAMA_CLIPPING |