Remove libc wrapper types from Xisb interfaces.

This commit is contained in:
Adam Jackson 2006-04-07 16:08:50 +00:00
parent 47bdc9528c
commit 94e7213d59
3 changed files with 16 additions and 8 deletions

View File

@ -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> 2006-04-07 Daniel Stone <daniel@freedesktop.org>
* hw/xfree86/utils/xorgcfg/keyboard-cfg.c: * hw/xfree86/utils/xorgcfg/keyboard-cfg.c:

View File

@ -69,7 +69,7 @@
****************************************************************************/ ****************************************************************************/
_X_EXPORT XISBuffer * _X_EXPORT XISBuffer *
XisbNew (int fd, xf86ssize_t size) XisbNew (int fd, ssize_t size)
{ {
XISBuffer *b; XISBuffer *b;
@ -142,8 +142,8 @@ XisbRead (XISBuffer *b)
} }
/* the only purpose of this function is to provide output tracing */ /* the only purpose of this function is to provide output tracing */
_X_EXPORT xf86ssize_t _X_EXPORT ssize_t
XisbWrite (XISBuffer *b, unsigned char *msg, xf86ssize_t len) XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len)
{ {
if (b->trace) if (b->trace)
{ {

View File

@ -29,6 +29,8 @@
#ifndef _xisb_H_ #ifndef _xisb_H_
#define _xisb_H_ #define _xisb_H_
#include <unistd.h>
/****************************************************************************** /******************************************************************************
* Definitions * Definitions
* structs, typedefs, #defines, enums * structs, typedefs, #defines, enums
@ -39,9 +41,9 @@ typedef struct _XISBuffer
int fd; int fd;
int trace; int trace;
int block_duration; int block_duration;
xf86ssize_t current; /* bytes read */ ssize_t current; /* bytes read */
xf86ssize_t end; ssize_t end;
xf86ssize_t buffer_size; ssize_t buffer_size;
unsigned char *buf; unsigned char *buf;
} XISBuffer; } XISBuffer;
@ -51,10 +53,10 @@ typedef struct _XISBuffer
* of globals. * of globals.
* put locals in the .c file. * put locals in the .c file.
*****************************************************************************/ *****************************************************************************/
XISBuffer * XisbNew (int fd, xf86ssize_t size); XISBuffer * XisbNew (int fd, ssize_t size);
void XisbFree (XISBuffer *b); void XisbFree (XISBuffer *b);
int XisbRead (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 XisbTrace (XISBuffer *b, int trace);
void XisbBlockDuration (XISBuffer *b, int block_duration); void XisbBlockDuration (XISBuffer *b, int block_duration);