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

Merge branch 'uli42-pr/run_xinerama_without_debug_output' into 3.6.x
9df15366 · Mike Gabriel · 9c1275f5 · b7d7ff3e · 9df15366
Unverified Commit 9df15366 authored Jun 25, 2016 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Screen.c nx-X11/programs/Xserver/hw/nxagent/Screen.c +5 -5

No files found.
--- 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