fixes

[henge/apc.git] / src / ir.c

diff --git a/src/ir.c b/src/ir.c
index 76c221d..3f22400 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -29,11 +29,23 @@ static
 \r
 static inline\r
 struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);\r
-static inline\r
-void                  ir_quit_r(struct pagenode_t*);\r
+static\r
+void                  ir_free_pages(struct pagenode_t*);\r
 static inline\r
 int                   bytes_identical(uint8_t*,uint8_t*);\r
-\r
+static\r
+void*                 stack_alloc(size_t);\r
+/* Memory allocator */\r
+struct pagenode_t {\r
+  struct pagenode_t* next;\r
+  char*              head;\r
+  char               root[];\r
+}* pagenode_root, * pagenode_head;\r
+#define PN_ALLOCSIZE    (sys_pagesize)\r
+#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(char*))\r
+#define PN_MEMSIZE()    (PN_ALLOCSIZE - PN_HEADERSIZE())\r
+#define PN_HEADSIZE()   (pagenode_head->head - pagenode_head->root)\r
+#define PN_HEADSPACE()  (PN_MEMSIZE() - PN_HEADSIZE())\r
 /* Enumerated types */\r
 enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r
 enum ltype { OLINK, MLINK, VLINK, ALINK };\r
@@ -128,13 +140,13 @@ int ir_init
 */\r
 void ir_quit\r
 ( void )\r
-{ ir_quit_r(pagenode_root); }\r
+{ ir_free_pages(pagenode_root); }\r
 \r
-static inline\r
-void ir_quit_r\r
+static\r
+void ir_free_pages\r
 ( struct pagenode_t* pagenode )\r
 { if (pagenode->next != NULL)\r
-    ir_quit_r(pagenode->next);\r
+    ir_free_pages(pagenode->next);\r
   free(pagenode);\r
 }\r
 \r
@@ -377,19 +389,6 @@ union ir_setdata_t* ir_audio
   return (union ir_setdata_t*) audio;\r
 }\r
 \r
-\r
-#define PN_ALLOCSIZE    (sys_pagesize)\r
-#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(void*))\r
-#define PN_MEMSIZE()    (PN_ALLOCSIZE - PN_HEADERSIZE())\r
-#define PN_HEADSIZE()   (pagenode_head->head - pagenode_head->root)\r
-#define PN_HEADSPACE()  (PN_MEMSIZE() - PN_HEADSIZE())\r
-struct pagenode_t {\r
-  struct pagenode_t* next;\r
-  char*              head;\r
-  char               root[];\r
-}* pagenode_root, * pagenode_head;\r
-\r
-\r
 static\r
 void* stack_alloc(size_t bytes)\r
 { if (!bytes)\r