diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | hw/xfree86/common/xisb.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/common/xisb.h | 12 |
3 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2006-04-07 Adam Jackson <ajax@freedesktop.org> + + * hw/xfree86/common/xisb.c: + * hw/xfree86/common/xisb.h: + Remove libc wrapper types from Xisb interfaces. + 2006-04-07 Daniel Stone <daniel@freedesktop.org> * hw/xfree86/utils/xorgcfg/keyboard-cfg.c: diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 8ec6f4c13..916066005 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -69,7 +69,7 @@ ****************************************************************************/ _X_EXPORT XISBuffer * -XisbNew (int fd, xf86ssize_t size) +XisbNew (int fd, ssize_t size) { XISBuffer *b; @@ -142,8 +142,8 @@ XisbRead (XISBuffer *b) } /* the only purpose of this function is to provide output tracing */ -_X_EXPORT xf86ssize_t -XisbWrite (XISBuffer *b, unsigned char *msg, xf86ssize_t len) +_X_EXPORT ssize_t +XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len) { if (b->trace) { diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 39ae2ee11..01ae675c4 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -29,6 +29,8 @@ #ifndef _xisb_H_ #define _xisb_H_ +#include <unistd.h> + /****************************************************************************** * Definitions * structs, typedefs, #defines, enums @@ -39,9 +41,9 @@ typedef struct _XISBuffer int fd; int trace; int block_duration; - xf86ssize_t current; /* bytes read */ - xf86ssize_t end; - xf86ssize_t buffer_size; + ssize_t current; /* bytes read */ + ssize_t end; + ssize_t buffer_size; unsigned char *buf; } XISBuffer; @@ -51,10 +53,10 @@ typedef struct _XISBuffer * of globals. * put locals in the .c file. *****************************************************************************/ -XISBuffer * XisbNew (int fd, xf86ssize_t size); +XISBuffer * XisbNew (int fd, ssize_t size); void XisbFree (XISBuffer *b); int XisbRead (XISBuffer *b); -xf86ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, xf86ssize_t len); +ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len); void XisbTrace (XISBuffer *b, int trace); void XisbBlockDuration (XISBuffer *b, int block_duration); |