win32 compile fixes

[swftools.git] / lib / bitio.c

diff --git a/lib/bitio.c b/lib/bitio.c
index 90c3fe6..920b4ce 100644 (file)
--- a/lib/bitio.c
+++ b/lib/bitio.c
@@ -149,7 +149,7 @@ static void writer_memwrite_finish(writer_t*w)
 void writer_init_memwriter(writer_t*w, void*data, int len)
 {
     struct memwrite_t *mr;
-    mr = (memwrite_t *)malloc(sizeof(struct memwrite_t));
+    mr = (struct memwrite_t*)malloc(sizeof(struct memwrite_t));
     mr->data = (unsigned char *)data;
     mr->length = len;
     memset(w, 0, sizeof(writer_t));
@@ -178,13 +178,12 @@ static int writer_growmemwrite_write(writer_t*w, void* data, int len)
        exit(1);
     }
     if(mw->length - w->pos < len) {
-       unsigned char*newmem;
        int newlength = mw->length;
        while(newlength - w->pos < len) {
            newlength += mw->grow;
        }
 #ifdef NO_REALLOC
-       newmem = (unsigned char*)malloc(newlength);
+       unsigned char*newmem = (unsigned char*)malloc(newlength);
        memcpy(newmem, mw->data, mw->length);
        free(mw->data);
        mw->data = newmem;