osx_write.c: Kill the typedef for struct osx_buffer

Typedefs are evil.

diff --git a/osx_write.c b/osx_write.c
index 4656b9d2f22ef16bf23decc41d26371b6e0bc024..87d700cc24fc926f0f3f9e5ede87ec35cc5475d7 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -44,14 +44,13 @@ struct osx_buffer {
        long remaining;
        struct osx_buffer *next;
 };
-typedef struct osx_buffer osx_buffer; /* FIXME */
 
 struct private_osx_write_data {
        long size;
        AudioUnit output;
        char play;
-       osx_buffer *from; /* Current buffers */
-       osx_buffer *to;
+       struct osx_buffer *from; /* Current buffers */
+       struct osx_buffer *to;
        unsigned samplerate;
        unsigned channels;
 };
@@ -68,8 +67,8 @@ struct private_osx_write_data {
 
 static void destroy_buffers(struct private_osx_write_data *powd)
 {
-       osx_buffer *ptr;
-       osx_buffer *ptr2;
+       struct osx_buffer *ptr;
+       struct osx_buffer *ptr2;
        ptr = powd->to->next;
        powd->to->next = NULL;
        while (ptr) {
@@ -84,10 +83,10 @@ static void init_buffers(struct private_osx_write_data *powd)
 {
        int i;
 
-       osx_buffer ** ptrptr;
+       struct osx_buffer **ptrptr;
        ptrptr = &powd->to;
        for (i = 0; i < NUMBER_BUFFERS; i++) {
-               *ptrptr = malloc(sizeof(osx_buffer));
+               *ptrptr = malloc(sizeof(struct osx_buffer));
                (*ptrptr)->size = 0;
                (*ptrptr)->remaining = 0;
                (*ptrptr)->buffer = NULL;
@@ -96,7 +95,7 @@ static void init_buffers(struct private_osx_write_data *powd)
        *ptrptr = powd->from = powd->to;
 }
 
-static void fill_buffer(osx_buffer *b, short *source, long size)
+static void fill_buffer(struct osx_buffer *b, short *source, long size)
 {
        float *dest;