Global cleanups

1 files changed, 13 insertions, 12 deletions

diff --git a/fribidi_mem.c b/fribidi_mem.c
index 73bcadd..3034a31 100644
--- a/fribidi_mem.c
+++ b/fribidi_mem.c
@@ -23,6 +23,17 @@
 #include <ctype.h>
 #include "fribidi_mem.h"
 
+struct _FriBidiMemChunk
+{
+  char *name;
+  int atom_size;
+  int area_size;
+  int type;
+
+  int empty_size;
+  void *chunk;
+};
+
 FriBidiList *
 fribidi_list_append (FriBidiList *list, void *data)
 {
@@ -42,17 +53,6 @@ fribidi_list_append (FriBidiList *list, void *data)
   return list;
 }
 
-struct _FriBidiMemChunk
-{
-  char *name;
-  int atom_size;
-  int area_size;
-  int type;
-
-  int empty_size;
-  void *chunk;
-};
-
 FriBidiMemChunk *
 fribidi_mem_chunk_new (char *name, int atom_size, unsigned long area_size,
 		       int type)
@@ -90,7 +90,8 @@ fribidi_mem_chunk_alloc (FriBidiMemChunk *mem_chunk)
 	  mem_chunk->empty_size = mem_chunk->area_size;
 	}
       m = mem_chunk->chunk;
-      mem_chunk->chunk += mem_chunk->atom_size;
+      mem_chunk->chunk = (void *)
+	((char *) mem_chunk->chunk + mem_chunk->atom_size);
       mem_chunk->empty_size -= mem_chunk->atom_size;
     }
   else