From e0d1211591b1caeff41a5ba6567a052c2c634912 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 18 Dec 2011 16:09:01 +0000 Subject: Bugfix Update to xserver 1.11.3 --- xserver/include/input.h | 4 ++-- xserver/include/os.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'xserver/include') diff --git a/xserver/include/input.h b/xserver/include/input.h index 5377a0c13..0d995f5b9 100644 --- a/xserver/include/input.h +++ b/xserver/include/input.h @@ -464,13 +464,13 @@ extern _X_EXPORT void QueueKeyboardEvents( int key_code, const ValuatorMask *mask); -extern int GetProximityEvents( +extern _X_EXPORT int GetProximityEvents( InternalEvent *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask); -extern void QueueProximityEvents( +extern _X_EXPORT void QueueProximityEvents( DeviceIntPtr pDev, int type, const ValuatorMask *mask); diff --git a/xserver/include/os.h b/xserver/include/os.h index 9327dc4cf..5794758ba 100644 --- a/xserver/include/os.h +++ b/xserver/include/os.h @@ -455,9 +455,10 @@ extern _X_EXPORT CallbackListPtr ReplyCallback; typedef struct { ClientPtr client; const void *replyData; - unsigned long dataLenBytes; + unsigned long dataLenBytes; /* actual bytes from replyData + pad bytes */ unsigned long bytesRemaining; Bool startOfReply; + unsigned long padBytes; /* pad bytes from zeroed array */ } ReplyInfoRec; /* stuff for FlushCallback */ -- cgit v1.2.3