xserver: Branch 'master'

[Keith Packard]

 os/io.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f9d78d8ffb1a312f9b3d69c05323f601571e162
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Oct 4 22:51:06 2012 -0700

    os: Don't re-declare ConnectionInputPtr and ConnectionOutputPtr
    
    They're declared in osdep.h, so don't redeclare them in io.c as
    well. Keeps the compiler happier.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/os/io.c b/os/io.c
index 5c3aceb..2f091c4 100644
--- a/os/io.c
+++ b/os/io.c
@@ -90,14 +90,14 @@ typedef struct _connectionInput {
     int lenLastReq;
     int size;
     unsigned int ignoreBytes;   /* bytes to ignore before the next request */
-} ConnectionInput, *ConnectionInputPtr;
+} ConnectionInput;
 
 typedef struct _connectionOutput {
     struct _connectionOutput *next;
     unsigned char *buf;
     int size;
     int count;
-} ConnectionOutput, *ConnectionOutputPtr;
+} ConnectionOutput;
 
 static ConnectionInputPtr AllocateInputBuffer(void);
 static ConnectionOutputPtr AllocateOutputBuffer(void);