[PATCH updated] input: Don't implicitly define verify_internal_event

[Peter Hutterer]

On Sat, May 14, 2011 at 04:23:59PM -0700, Jeremy Huddleston wrote:
> 
> From 2f6a3c12b2d344e6cb38c89423f1227453e9a0b4 Mon Sep 17 00:00:00 2001
> From: Jeremy Huddleston <jeremyhu at apple.com>
> Date: Sat, 14 May 2011 12:23:44 -0700
> Subject: [PATCH] input: Don't implicitly define verify_internal_event
> 
> Fixes regression introduced by 56901998020b6f443cbaa5eb303100d979e81b22

pulled in, thanks

Cheers,
  Peter
> 
> mieq.c:159:5: error: implicit declaration of function 'verify_internal_event' is invalid in C99 [-Wimplicit-function-declaration,Semantic Issue]
>     verify_internal_event(e);
>     ^
> 1 error generated.
> 
> Also includes some other warning cleanups in events.c we're there.
> 
> events.c:2198:24: warning: equality comparison with extraneous parentheses [-Wparentheses,Semantic Issue]
>         else if ((type == MotionNotify))
>                   ~~~~~^~~~~~~~~~~~~~~
> events.c:2198:24: note: remove extraneous parentheses around the comparison to silence this warning [Semantic Issue]
>         else if ((type == MotionNotify))
>                  ~     ^              ~
> events.c:2198:24: note: use '=' to turn this equality comparison into an assignment [Semantic Issue]
>         else if ((type == MotionNotify))
>                        ^~
>                        =
> events.c:2487:5: error: implicit declaration of function 'verify_internal_event' is invalid in C99 [-Wimplicit-function-declaration,Semantic Issue]
>     verify_internal_event(event);
>     ^
> events.c:5909:22: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
>         DeviceIntPtr it = inputInfo.devices;
>                      ^
> events.c:5893:18: note: previous declaration is here
>     DeviceIntPtr it = inputInfo.devices;
>                  ^
> 3 warnings and 1 error generated.
> 
> events.c:2836:27: warning: incompatible pointer types passing 'DeviceEvent *' (aka 'struct _DeviceEvent *') to parameter of type
>       'const InternalEvent *' (aka 'const union _InternalEvent *')
>     verify_internal_event(ev);
>                           ^~
> ../include/inpututils.h:40:56: note: passing argument to parameter 'ev' here
> extern void verify_internal_event(const InternalEvent *ev);
>                                                        ^
> 1 warning generated.
> 
> Found-by: yuffie tinderbox (-Werror=implicit)
> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> ---
>  dix/events.c |    7 ++++---
>  mi/mieq.c    |    1 +
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/dix/events.c b/dix/events.c
> index 14f6f90..b60c299 100644
> --- a/dix/events.c
> +++ b/dix/events.c
> @@ -112,6 +112,7 @@ Equipment Corporation.
>  #include <X11/Xproto.h>
>  #include "windowstr.h"
>  #include "inputstr.h"
> +#include "inpututils.h"
>  #include "scrnintstr.h"
>  #include "cursorstr.h"
>  
> @@ -2195,7 +2196,7 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
>           */
>          if (!grab && ActivateImplicitGrab(pDev, client, pWin, pEvents, deliveryMask))
>              /* grab activated */;
> -        else if ((type == MotionNotify))
> +        else if (type == MotionNotify)
>              pDev->valuator->motionHintWindow = pWin;
>          else if (type == DeviceMotionNotify || type == DeviceButtonPress)
>                  CheckDeviceGrabAndHintWindow (pWin, type,
> @@ -2832,7 +2833,7 @@ CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev)
>      WindowPtr prevSpriteWin, newSpriteWin;
>      SpritePtr pSprite = pDev->spriteInfo->sprite;
>  
> -    verify_internal_event(ev);
> +    verify_internal_event((InternalEvent *)ev);
>  
>      prevSpriteWin = pSprite->win;
>  
> @@ -5906,7 +5907,7 @@ PickPointer(ClientPtr client)
>  
>      if (!client->clientPtr)
>      {
> -        DeviceIntPtr it = inputInfo.devices;
> +        it = inputInfo.devices;
>          while (it)
>          {
>              if (IsMaster(it) && it->spriteInfo->spriteOwner)
> diff --git a/mi/mieq.c b/mi/mieq.c
> index 031b11a..fc3738a 100644
> --- a/mi/mieq.c
> +++ b/mi/mieq.c
> @@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
>  # include   "windowstr.h"
>  # include   "pixmapstr.h"
>  # include   "inputstr.h"
> +# include   "inpututils.h"
>  # include   "mi.h"
>  # include   "mipointer.h"
>  # include   "scrnintstr.h"
> -- 
> 1.7.4.1
> 
> 
>