summaryrefslogtreecommitdiffstats
path: root/client/x11
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-01-24 18:17:34 +0200
committerAlon Levy <alevy@redhat.com>2011-01-27 12:48:25 +0200
commit54c91e89fbe93107d13e9a10acea85227ebe9735 (patch)
tree6c751f0aec339d8934e70248697a76d9bcf4d54f /client/x11
parenta7b66f77ba091479ced631fb31d7b9ad4fd94775 (diff)
downloadspice-54c91e89fbe93107d13e9a10acea85227ebe9735.tar.gz
spice-54c91e89fbe93107d13e9a10acea85227ebe9735.tar.xz
spice-54c91e89fbe93107d13e9a10acea85227ebe9735.zip
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.
Diffstat (limited to 'client/x11')
-rw-r--r--client/x11/platform.cpp7
1 files changed, 5 insertions, 2 deletions
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");