xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 hw/dmx/input/dmxevents.c |    2 +-
 hw/dmx/input/dmxmotion.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d0cb507ae568c8da92f10ff1188d797bcaa3d1a
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Fri Oct 17 09:59:29 2008 +1030

    dmx: avoid hilarious #define Xcalloc xcalloc game.

diff --git a/hw/dmx/input/dmxmotion.c b/hw/dmx/input/dmxmotion.c
index e7f5b59..73580a2 100644
--- a/hw/dmx/input/dmxmotion.c
+++ b/hw/dmx/input/dmxmotion.c
@@ -113,7 +113,7 @@ void dmxPointerPutMotionEvent(DeviceIntPtr pDevice,
                                      * DMX_MOTION_SIZE);
         dmxLocal->head      = 0;
         dmxLocal->tail      = 0;
-        dmxLocal->valuators = xcalloc(sizeof(*dmxLocal->valuators), numAxes);
+        dmxLocal->valuators = calloc(sizeof(*dmxLocal->valuators), numAxes);
     } else {
         if (++dmxLocal->tail >= DMX_MOTION_SIZE) dmxLocal->tail = 0;
         if (dmxLocal->head == dmxLocal->tail)
commit 8a23707b866c11807e01056db97afec56e9b19c8
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Fri Oct 17 09:15:39 2008 +1030

    dmx: change remainder of manual EQ allocation to GetEventList().

diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 4b51ffd..24275a1 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -711,7 +711,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
         return;
 
     case MotionNotify:
-        events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum());
+        GetEventList(&events);
         valuators[0] = e->xmotion.x;
         valuators[1] = e->xmotion.y;
         valuators[2] = e->xmotion.state;