diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:40 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:40 +0000 |
commit | dab35027e56ba9c3c575dc41a041168bab00b4bb (patch) | |
tree | 320aaabfd01f23459cceab375ab853f0b6a7467a /lbxopts.h | |
parent | 9a41c9c6452753ac1911a585e59982e8e5186c6b (diff) | |
download | xorg-proto-xextproto-dab35027e56ba9c3c575dc41a041168bab00b4bb.tar.gz |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'lbxopts.h')
-rw-r--r-- | lbxopts.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -21,6 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +/* $XFree86: xc/include/extensions/lbxopts.h,v 1.6 2001/10/28 03:32:26 tsi Exp $ */ #ifndef _LBX_OPTS_H_ #define _LBX_OPTS_H_ @@ -51,7 +52,7 @@ (size) = LBX_OPT_SMALLLEN_SIZE; \ } \ else { \ - (len) = LBX_OPT_BIGLEN_MIN + (p)[1] << 8 | (p)[2]; \ + (len) = ((LBX_OPT_BIGLEN_MIN + (p)[1]) << 8) | (p)[2]; \ (size) = LBX_OPT_BIGLEN_SIZE; \ } @@ -85,13 +86,17 @@ struct iovec { }; #else +#ifndef Lynx #include <sys/uio.h> +#else +#include <uio.h> +#endif #endif typedef void *LbxStreamCompHandle; typedef struct _LbxStreamOpts { - LbxStreamCompHandle (*streamCompInit)(); + LbxStreamCompHandle (*streamCompInit)(int fd, pointer arg); pointer streamCompArg; int (*streamCompStuffInput)( int fd, |