From 50888bef94d01d4b2a69fe687929fcf7ae9473b5 Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Sat, 15 Mar 2008 21:06:47 -0400
Subject: [PATCH] Fixes issues/warnings in bug 193327.

---
 scheme/last-revision | 2 +-
 src/ikarus-collect.c | 4 ++--
 src/ikarus-fasl.c    | 2 +-
 src/ikarus-runtime.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scheme/last-revision b/scheme/last-revision
index 1ffb6f4..8891917 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1413
+1414
diff --git a/src/ikarus-collect.c b/src/ikarus-collect.c
index b6afd04..9b0c13e 100644
--- a/src/ikarus-collect.c
+++ b/src/ikarus-collect.c
@@ -1044,7 +1044,7 @@ add_object_proc(gc_t* gc, ikptr x)
       /* real vector */
       //fprintf(stderr, "X=0x%08x, FST=0x%08x\n", (int)x, (int)fst);
       ikptr size = fst;
-      assert(size >= 0);
+      assert(((long)size) >= 0);
       ikptr memreq = align(size + disp_vector_data);
       if(memreq >= pagesize){
         if((t & large_object_mask) == large_object_tag){
@@ -1654,7 +1654,7 @@ scan_dirty_code_page(gc_t* gc, long int page_idx, unsigned int mask){
       segment_vec = gc->segment_vector;
       ikptr rvec = ref(p, disp_code_reloc_vector);
       ikptr len = ref(rvec, off_vector_length);
-      assert(len >= 0);
+      assert(((long)len) >= 0);
       long int i;
       unsigned long int code_d = segment_vec[page_index(rvec)];
       for(i=0; i<len; i+=wordsize){
diff --git a/src/ikarus-fasl.c b/src/ikarus-fasl.c
index 0476b83..59ad43a 100644
--- a/src/ikarus-fasl.c
+++ b/src/ikarus-fasl.c
@@ -289,7 +289,7 @@ static ikptr do_read(ikpcb* pcb, fasl_port* p){
     ref(code, disp_code_code_size) = fix(code_size);
     ref(code, disp_code_freevars) = freevars;
     ref(code, disp_code_annotation) = annotation;
-    fasl_read_buf(p, (void*)(long)code+disp_code_data, code_size);
+    fasl_read_buf(p, (void*)(disp_code_data+(long)code), code_size);
     if(put_mark_index){
       p->marks[put_mark_index] = code+vector_tag;
     }
diff --git a/src/ikarus-runtime.c b/src/ikarus-runtime.c
index 763c3ac..bd90c6b 100644
--- a/src/ikarus-runtime.c
+++ b/src/ikarus-runtime.c
@@ -985,4 +985,4 @@ ikptr
 ikrt_debug(ikptr x){
   fprintf(stderr, "DEBUG 0x%016lx\n", (long int)x);
   return 0;
-};
+}