[PULL] xquartz build fix, couple of minor fixes

[Peter Hutterer]

The two most important ones in this set:
- xquartz build fix (broken by ABI 12)
- make check fix (broken by the new valuator mask code)

one compiler warning, more AEI cleanup, one XI property garbage fix from a
while ago.

The following changes since commit da66119593b63ef82ae6fa2e034ccd0856b03a80:

  dix: fix root window background behaviour for protocol calls (2010-11-11 23:25:06 +0200)

are available in the git repository at:
  git://people.freedesktop.org/~whot/xserver.git for-keith

Cyril Brulebois (1):
      test: Fix missing xkbsrv.h include.

Jeremy Huddleston (1):
      XQuartz: Build-fixes for XQuartz for recent input API changes

Peter Hutterer (3):
      Xi: move property reset from extension shutdown to init.
      dix: fix typo in setting valuator modes (#21548)
      xfree86: rename allowEmptyInput to forceInputDevices.

 Xi/extinit.c                    |    4 ++--
 dix/devices.c                   |    2 +-
 hw/xfree86/common/xf86Config.c  |   36 +++++++++++++++++++-----------------
 hw/xfree86/common/xf86Globals.c |    4 ++--
 hw/xfree86/common/xf86Privstr.h |    3 +--
 hw/xquartz/darwin.c             |    2 --
 hw/xquartz/darwinEvents.c       |    7 ++++---
 test/xi2/protocol-common.c      |    1 +
 8 files changed, 30 insertions(+), 29 deletions(-)