xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 dix/getevents.c    |    3 ---
 hw/vfb/InitInput.c |    1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b43a4e2d38adb9ff16204218f24df93cfd820d1b
Author: Magnus Kessler <Magnus.Kessler at gmx.net>
Date:   Tue Jan 27 09:30:37 2009 +1000

    Xvfb: add missing include for new xkbsrv.h
    
    Commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e added call to
    XkbGetRulesDflts defined in xkbsrv.h
    
    Signed-off-by: Magnus Kessler <Magnus.Kessler at gmx.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 578cc49..aa90252 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -39,6 +39,7 @@ from The Open Group.
 #include "mibstore.h"
 #include "mipointer.h"
 #include "lk201kbd.h"
+#include "xkbsrv.h"
 #include <X11/keysym.h>
 
 Bool
commit a7e6424d992151c504a75bb807fa34c57ad52cad
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 23 17:11:57 2009 +1100

    dix: remove obsolete comment. Event lists should not be allocated by the DDX

diff --git a/dix/getevents.c b/dix/getevents.c
index ce086d5..8af97c6 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -458,9 +458,6 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
  * Returns the maximum number of events GetKeyboardEvents,
  * GetKeyboardValuatorEvents, and GetPointerEvents will ever return.
  *
- * Should be used in DIX as:
- * xEvent *events = xcalloc(sizeof(xEvent), GetMaximumEventsNum());
- *
  * This MUST be absolutely constant, from init until exit.
  */
 int