[PATCH] Warning fix for the definer and conumer of CopyGetMasterEvent.

Peter Hutterer peter.hutterer at who-t.net
Wed Dec 3 14:48:03 PST 2008


On Wed, Dec 03, 2008 at 01:29:11PM -0800, Eric Anholt wrote:
> ---
>  mi/mi.h         |    3 +++
>  xkb/ddxDevBtn.c |    3 ++-
>  2 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/mi/mi.h b/mi/mi.h
> index 444d3ad..1dc4780 100644
> --- a/mi/mi.h
> +++ b/mi/mi.h
> @@ -222,6 +222,9 @@ extern void miClearDrawable(
>      GCPtr /*pGC*/
>  );
>  
> +void CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original,
> +			xEvent** master, int count);
> +
>  /* mifillrct.c */
>  
>  extern void miPolyFillRect(
> diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
> index 66a4cc4..d5465f6 100644
> --- a/xkb/ddxDevBtn.c
> +++ b/xkb/ddxDevBtn.c
> @@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
>  #include "inputstr.h"
>  #include "scrnintstr.h"
>  #include "windowstr.h"
> +#include "mi.h"
>  #include <xkbsrv.h>
>  #include <X11/extensions/XI.h>
>  #include <X11/extensions/XIproto.h>
> @@ -111,7 +112,7 @@ DeviceIntPtr		master = NULL;
>          if (!IsPointerDevice(master))
>              master = GetPairedDevice(dev->u.master);
>  
> -        CopyGetMasterEvent(master, &events, &m_events, count);
> +        CopyGetMasterEvent(master, events, &m_events, count);
>      }
>  
>      (*dev->public.processInputProc)((xEventPtr)btn, dev, count);
> -- 
> 1.5.6.5

Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
 
Cheers,
  Peter



More information about the xorg mailing list