From ade5ecb2c8184775a9b7329d6c026b62cb08a91e Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@gmail.com>
Date: Tue, 22 Mar 2011 16:16:05 +0100
Subject: opengl: fix compilation

When OpenGL is enabled, build fails in DisplayChannel::create_surface
because Canvas *canvas is declared twice. Remove the first
declaration to fix compilation.
---
 client/display_channel.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'client/display_channel.cpp')

diff --git a/client/display_channel.cpp b/client/display_channel.cpp
index 94bfe6b5..2950c30d 100644
--- a/client/display_channel.cpp
+++ b/client/display_channel.cpp
@@ -1437,9 +1437,6 @@ void DisplayChannel::create_primary_surface(int width, int height, uint32_t form
 
 void DisplayChannel::create_surface(int surface_id, int width, int height, uint32_t format)
 {
-#ifdef USE_OGL
-    Canvas *canvas;
-#endif
     AutoRef<CreateSurfaceEvent> event(new CreateSurfaceEvent(*this, surface_id, width, height,
                                                              format));
     get_client().push_event(*event);
-- 
cgit