fixes

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

diff --git a/src/ir.c b/src/ir.c
index afc9cbd..63fe72b 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -247,11 +247,11 @@ struct ir_framebox_t* ir_set_add_framebox
   if (bytes_identical(iter->header.data_name, name))\r
     return iter;\r
   if (iter->header.nextsib != NULL)\r
-    { iter = iter->header.nextsib;\r
+    { iter = (struct ir_framebox_t*) iter->header.nextsib;\r
       goto check;\r
     }\r
   iter->header.nextsib = (union ir_setdata_t*) struct_alloc(ir_framebox_t);\r
-  return iter->header.nextsib;\r
+  return (struct ir_framebox_t*) iter->header.nextsib;\r
 }\r
 \r
 /* Match two null-terminated bytestrings\r
@@ -307,17 +307,17 @@ void ir_set_assign_data
              return;\r
            }\r
          else\r
-           simplex = simplex->header.nextsib->audio;\r
+           simplex = (struct ir_simplex_t*) simplex->header.nextsib;\r
        simplex->header.nextsib = setdata;\r
        break;\r
       case LDAT:\r
        if (set->links == NULL)\r
-         { set->links = setdata;\r
+         { set->links = (struct ir_link_t*) setdata;\r
            return;\r
          }\r
        link = set->links;\r
        while (link->header.nextsib != NULL)\r
-         link = link->header.nextsib.link;\r
+         link = (struct ir_link_t*) link->header.nextsib;\r
        link->header.nextsib = setdata;\r
        break;\r
       default:\r
@@ -332,7 +332,7 @@ void ir_set_assign_ref
 )\r
 { if (set->ref != 0)\r
     wprintf("Ref override: 0x%lx -> 0x%lx for set %s\n",\r
-           set->ref, ref, set->name);\r
+           (long unsigned) set->ref, (long unsigned) ref, set->name);\r
   set->ref = ref;\r
   //TODO: reflist_add(set);\r
 }\r