[Spice-devel] [PATCH spice-gtk 1/2] vncdisplaykeymap: fix -Werror=tautological-compare

[Frediano Ziglio]

> 
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
> 
> vncdisplaykeymap.c: In function 'vnc_display_keymap_gdk2xtkbd_table':
> vncdisplaykeymap.c:223:14: error: self-comparison always evaluates to true
> [-Werror=tautological-compare]
>   if (GDK_IS_WIN32_WINDOW(window)) {
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
> ---
>  src/vncdisplaykeymap.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
> index 9ee501d..c50f9f7 100644
> --- a/src/vncdisplaykeymap.c
> +++ b/src/vncdisplaykeymap.c
> @@ -89,7 +89,7 @@ static unsigned int ref_count_for_untranslated_keys = 0;
>  
>  /* Gtk2 compat */
>  #ifndef GDK_IS_X11_WINDOW
> -#define GDK_IS_X11_WINDOW(win) (win == win)
> +#define GDK_IS_X11_WINDOW(win) (1)
>  #endif
>  #endif
>  
> @@ -99,7 +99,7 @@ static unsigned int ref_count_for_untranslated_keys = 0;
>  
>  /* Gtk2 compat */
>  #ifndef GDK_IS_WIN32_WINDOW
> -#define GDK_IS_WIN32_WINDOW(win) (win == win)
> +#define GDK_IS_WIN32_WINDOW(win) (1)
>  #endif
>  #endif
>  
> @@ -109,7 +109,7 @@ static unsigned int ref_count_for_untranslated_keys = 0;
>  
>  /* Gtk2 compat */
>  #ifndef GDK_IS_QUARTZ_WINDOW
> -#define GDK_IS_QUARTZ_WINDOW(win) (win == win)
> +#define GDK_IS_QUARTZ_WINDOW(win) (1)
>  #endif
>  #endif
>  
> @@ -119,7 +119,7 @@ static unsigned int ref_count_for_untranslated_keys = 0;
>  
>  /* Gtk2 compat */
>  #ifndef GDK_IS_BROADWAY_WINDOW
> -#define GDK_IS_BROADWAY_WINDOW(win) (win == win)
> +#define GDK_IS_BROADWAY_WINDOW(win) (1)
>  #endif
>  
>  #endif

Acked-by: Frediano Ziglio <fziglio at redhat.com>

Frediano