[PULL] build fix, bug fix, warning fixes

[Peter Hutterer]

Most of them are just compiler warning fixes, of interest are the fix for
#49347 and the build fix after the DeviceFocusEvent removal from
enterleave.h

The following changes since commit 31174565ec0090b4c03c9334c82878be2455f938:

  dix: Remove redundant declarations. (2012-05-14 13:31:00 +0100)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to ae1c48ebc8a3c0b32b3d732e8a340bfe00bb9f79:

  Xi: fix "discards ''const' qualifier" warnings (2012-05-17 08:51:31 +1000)

----------------------------------------------------------------
Peter Hutterer (9):
      test: fix "redundant declaration of devices" warning
      test: fix "userdata shadows global declaration" warnings
      test: fix redundant declaration of "BadDevice"
      test: don't shadow parameter 'len'
      include: don't redeclare device events in xkbsrv.h
      dix: undo transformation for missing valuators (#49347)
      dix: Move DeviceFocusEvent from Xi into enterleave.c
      Xi: fix "shadows previous local" warnings
      Xi: fix "discards ''const' qualifier" warnings

Simon Thum (1):
      dix: indentation fixes for pointer acceleration

 Xi/exevents.c                           |  270 +------------------------------
 Xi/extinit.c                            |    7 +-
 Xi/xiproperty.c                         |    2 +-
 Xi/xiselectev.c                         |    8 +-
 dix/devices.c                           |   12 +-
 dix/enterleave.c                        |  239 +++++++++++++++++++++++++++
 dix/enterleave.h                        |    5 +
 dix/getevents.c                         |   25 ++-
 dix/ptrveloc.c                          |    3 +-
 include/exevents.h                      |    7 -
 include/ptrveloc.h                      |   15 +-
 include/xkbsrv.h                        |    3 -
 test/xi2/protocol-common.h              |    4 +-
 test/xi2/protocol-xipassivegrabdevice.c |    7 +-
 test/xi2/protocol-xiquerydevice.c       |   16 +-
 test/xi2/protocol-xiquerypointer.c      |    7 +-
 test/xi2/protocol-xiqueryversion.c      |    8 +-
 test/xi2/protocol-xiselectevents.c      |    1 +
 test/xi2/protocol-xisetclientpointer.c  |    1 +
 test/xi2/protocol-xiwarppointer.c       |    1 +
 20 files changed, 317 insertions(+), 324 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120517/a584acff/attachment.pgp>