[Spice-devel] [PATCH] opengl: fix compilation

[Hans de Goede]

Ack.

On 03/22/2011 04:16 PM, Christophe Fergeau wrote:
> 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 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/client/display_channel.cpp b/client/display_channel.cpp
> index 94bfe6b..2950c30 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);