From 54c91e89fbe93107d13e9a10acea85227ebe9735 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy@redhat.com>
Date: Mon, 24 Jan 2011 18:17:34 +0200
Subject: client/server: warning fixes (gcc 4.6.0)

gcc 4.6.0 added "[-Werror=unused-but-set-variable]", this and the next
few fixes tend to that. Mostly harmless.
---
 client/x11/platform.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'client/x11')

diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index 334a74ff..4877798e 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -3050,8 +3050,8 @@ void Platform::init()
 {
 #ifdef USE_OGL
     int err, ev;
-#endif // USE_OGL
     int threads_enable;
+#endif // USE_OGL
     int major, minor;
     Bool pixmaps;
 
@@ -3059,8 +3059,11 @@ void Platform::init()
 
     setlocale(LC_ALL, "");
 
+#ifdef USE_OGL
     threads_enable = XInitThreads();
-
+#else
+    XInitThreads();
+#endif
 
     if (!(x_display = XOpenDisplay(NULL))) {
         THROW("open X display failed");
-- 
cgit