From 073523155a76342d8b25d603187b658da072f5ec Mon Sep 17 00:00:00 2001 From: Pete Beardmore Date: Thu, 12 Jan 2012 22:20:24 +0000 Subject: [PATCH xserver] fix duplicate struct declarations move struct declarations for Connection(In|Out)put relateds to osdep header without leaving duplicate typedef. fixes bug 44744 Signed-off-by: Pete Beardmore --- os/io.c | 8 ++++---- os/osdep.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os/io.c b/os/io.c index 78b7260..5dc0b2c 100644 --- a/os/io.c +++ b/os/io.c @@ -84,7 +84,7 @@ SOFTWARE. CallbackListPtr ReplyCallback; CallbackListPtr FlushCallback; -typedef struct _connectionInput { +struct _connectionInput { struct _connectionInput *next; char *buffer; /* contains current client input */ char *bufptr; /* pointer to current start of data */ @@ -92,14 +92,14 @@ typedef struct _connectionInput { int lenLastReq; int size; unsigned int ignoreBytes; /* bytes to ignore before the next request */ -} ConnectionInput, *ConnectionInputPtr; +}; -typedef struct _connectionOutput { +struct _connectionOutput { struct _connectionOutput *next; unsigned char *buf; int size; int count; -} ConnectionOutput, *ConnectionOutputPtr; +}; static ConnectionInputPtr AllocateInputBuffer(void); static ConnectionOutputPtr AllocateOutputBuffer(void); diff --git a/os/osdep.h b/os/osdep.h index c9add48..3715a1f 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -108,8 +108,8 @@ typedef Bool (*AddAuthorFunc)(unsigned name_length, const char *name, unsigned data_length, char *data); #endif -typedef struct _connectionInput *ConnectionInputPtr; -typedef struct _connectionOutput *ConnectionOutputPtr; +typedef struct _connectionInput ConnectionInput,*ConnectionInputPtr; +typedef struct _connectionOutput ConnectionOutput,*ConnectionOutputPtr; struct _osComm; -- 1.7.4.4