[PATCH] Fix XWin compilation after updates for input API changes

Peter Hutterer peter.hutterer at who-t.net
Mon May 16 14:47:28 PDT 2011


On Mon, May 16, 2011 at 07:31:57PM +0100, Jon TURNEY wrote:
> From: Colin Harrison <colin.harrison at virgin.net>
> 
> Fix XWin compilation after updates for input API changes in commits
> e7150db5 8670c46b and 20fb07f4
> 
> Also remove a no longer needed InternalEvent* variable
> 
> Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
> ---

merged, thanks. and sorry, fwiw.

Cheers,
  Peter

>  hw/xwin/winkeybd.c |    6 ++----
>  hw/xwin/winmouse.c |    4 ++--
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
> index 2fa6b3f..a3112ff 100644
> --- a/hw/xwin/winkeybd.c
> +++ b/hw/xwin/winkeybd.c
> @@ -472,8 +472,6 @@ winKeybdReleaseKeys (void)
>  void
>  winSendKeyEvent (DWORD dwKey, Bool fDown)
>  {
> -  InternalEvent* events;
> -
>    /*
>     * When alt-tabing between screens we can get phantom key up messages
>     * Here we only pass them through it we think we should!
> @@ -485,8 +483,8 @@ winSendKeyEvent (DWORD dwKey, Bool fDown)
>  
>    QueueKeyboardEvents(g_pwinKeyboard, fDown ? KeyPress : KeyRelease, dwKey + MIN_KEYCODE, NULL);
>  
> -  winDebug("winSendKeyEvent: dwKey: %d, fDown: %d, nEvents %d\n",
> -           dwKey, fDown, nevents);
> +  winDebug("winSendKeyEvent: dwKey: %d, fDown: %d\n",
> +           dwKey, fDown);
>  }
>  
>  BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam)
> diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
> index b1b0657..752334a 100644
> --- a/hw/xwin/winmouse.c
> +++ b/hw/xwin/winmouse.c
> @@ -244,8 +244,8 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
>  		     POINTER_RELATIVE, &mask);
>  
>  #if CYGDEBUG
> -  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
> -          iEventType, iButton, nevents);
> +  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
> +          iEventType, iButton);
>  #endif
>  }
>  
> -- 
> 1.7.4
> 


More information about the xorg-devel mailing list