diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-21 08:06:12 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:06:12 +0100 |
| commit | 45710577f374972946a8eb37833a9c94e5a299bf (patch) | |
| tree | 83862aa10e13033fe715c36f673f6e82c5434934 /xorg-server/include | |
| parent | 1037d56ca89d503cfd62830a90e934a2806ad804 (diff) | |
| download | vcxsrv-45710577f374972946a8eb37833a9c94e5a299bf.tar.gz vcxsrv-45710577f374972946a8eb37833a9c94e5a299bf.tar.bz2 vcxsrv-45710577f374972946a8eb37833a9c94e5a299bf.zip | |
xserver xkeyboard-config mesa git update 21 nov 2011
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/Makefile.am | 1 | ||||
| -rw-r--r-- | xorg-server/include/os.h | 3 |
2 files changed, 3 insertions, 1 deletions
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 */ |