diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
| commit | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (patch) | |
| tree | 72ea4c93cc3337810a32ccc0fb34b3bd96d933e9 /xorg-server/include | |
| parent | e3710c8691dceaccf51bb80e5a1f7d1830758f7e (diff) | |
| parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
| download | vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.gz vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.bz2 vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.zip | |
Merge remote-tracking branch 'origin/released'
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 642caeb99..cddf30ca8 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -453,9 +453,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 */ |