From 45710577f374972946a8eb37833a9c94e5a299bf Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 21 Nov 2011 08:06:12 +0100 Subject: xserver xkeyboard-config mesa git update 21 nov 2011 --- xorg-server/include/Makefile.am | 1 + xorg-server/include/os.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'xorg-server/include') diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am index 6f63c764f..972f403ce 100644 --- a/xorg-server/include/Makefile.am +++ b/xorg-server/include/Makefile.am @@ -32,6 +32,7 @@ sdk_HEADERS = \ misc.h \ miscstruct.h \ opaque.h \ + optionstr.h \ os.h \ pixmap.h \ pixmapstr.h \ diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index b489211ab..823fe5d29 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -451,9 +451,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