branch merge

[irc/rqf/shadowircd.git] / libratbox / src / rawbuf.c

diff --git a/libratbox/src/rawbuf.c b/libratbox/src/rawbuf.c
index 39e3b5b3dd103c3e1f88ebb726f1fc9a33aaafb0..edc29584ed200329d15381a91edeb508f956e9b3 100644 (file)
--- a/libratbox/src/rawbuf.c
+++ b/libratbox/src/rawbuf.c
@@ -30,9 +30,9 @@
 struct _rawbuf
 {
        rb_dlink_node node;
-       rb_uint8_t data[RAWBUF_SIZE];
+       uint8_t data[RAWBUF_SIZE];
        int len;
-       rb_uint8_t flushing;
+       uint8_t flushing;
 };
 
 struct _rawbuf_head
@@ -207,7 +207,7 @@ rb_rawbuf_append(rawbuf_head_t * rb, void *data, int len)
                len -= clen;
                if(len == 0)
                        return;
-               data += clen;
+               data = (char *)data + clen;
 
        }
 
@@ -223,7 +223,7 @@ rb_rawbuf_append(rawbuf_head_t * rb, void *data, int len)
                memcpy(buf->data, data, clen);
                buf->len += clen;
                len -= clen;
-               data += clen;
+               data = (char *)data + clen;
                rb->len += clen;
        }
 }