--- src/map.c.64bit	2006-02-02 01:09:46.000000000 -0600
+++ src/map.c	2006-02-13 10:13:28.615918105 -0600
@@ -110,7 +110,7 @@
 // This one is used during mapMergeLightSource:
 static unsigned char tmp_lmap[VMASK_W * VMASK_H];
 
-static void myRmView(struct mview *view, void *data)
+static void myRmView(struct mview *view, int data)
 {
 	list_remove(&view->list);
 }
@@ -175,7 +175,7 @@
 	}
 }
 
-static void mapMergeView(struct mview *view, void *data)
+static void mapMergeView(struct mview *view, int data)
 {
 	int r_src, r_src_start, c_src, c_src_start, i_src, r_end, c_end;
 	int r_dst, r_dst_start, c_dst, c_dst_start, i_dst;
@@ -254,14 +254,13 @@
 
 }
 
-static void myMarkAsDirty(struct mview *view, void *data)
+static void myMarkAsDirty(struct mview *view, int data)
 {
 	view->dirty = 1;
 }
 
-static void mySetViewLightRadius(struct mview *view, void *data)
+static void mySetViewLightRadius(struct mview *view, int rad)
 {
-	int rad = (int) data;
 	view->rad = rad;
 }
 
@@ -482,7 +481,7 @@
 	Map.cam_y = max(Map.cam_y, Map.cam_min_y);
 }
 
-void mapForEachView(void (*fx) (struct mview *, void *), void *data)
+void mapForEachView(void (*fx) (struct mview *, int), int data)
 {
 	struct list *list;
 	list = Map.views.next;
@@ -1055,9 +1054,9 @@
 void mapSetRadius(struct mview *view, int rad)
 {
 	if (view == ALL_VIEWS)
-		mapForEachView(mySetViewLightRadius, (void *) rad);
+		mapForEachView(mySetViewLightRadius, rad);
 	else
-		mySetViewLightRadius(view, (void *) rad);
+		mySetViewLightRadius(view, rad);
 }
 
 int mapGetRadius(struct mview *view)
--- src/scheme.c.64bit	2006-02-02 00:26:10.000000000 -0600
+++ src/scheme.c	2006-02-13 18:04:05.368035764 -0600
@@ -594,7 +594,7 @@
 	  i = ++sc->last_cell_seg ;
 	  sc->alloc_seg[i] = cp;
 	  /* adjust in TYPE_BITS-bit boundary */
-	  if(((int)cp)%adj!=0) {
+	  if(((long)cp)%adj!=0) {
 	    cp=(char*)(adj*((long)cp/adj+1));
 	  }
         /* insert new segment in address order */
@@ -2138,7 +2138,7 @@
 
 static void s_save(scheme *sc, enum scheme_opcodes op, pointer args, pointer code) 
 { 
-  int nframes = (int)sc->dump; 
+  int nframes = (long)sc->dump; 
   struct dump_stack_frame *next_frame; 
 
   /* enough room for the next frame? */ 
@@ -2158,7 +2158,7 @@
 
 static pointer _s_return(scheme *sc, pointer a) 
 { 
-  int nframes = (int)sc->dump; 
+  int nframes = (long)sc->dump; 
   struct dump_stack_frame *frame; 
 
   sc->value = (a); 
@@ -2198,7 +2198,7 @@
 
 static INLINE void dump_stack_mark(scheme *sc) 
 { 
-  int nframes = (int)sc->dump;
+  int nframes = (long)sc->dump;
   int i;
   for(i=0; i<nframes; i++) {
     struct dump_stack_frame *frame;
--- src/closure.c.64bit	2006-02-13 18:08:57.162111298 -0600
+++ src/closure.c	2006-02-13 18:09:22.257237400 -0600
@@ -149,7 +149,7 @@
                 result = closure->sc->vptr->pair_cdr(pair);
                 goto evaluate_result;
         } else if (scm_is_ptr(closure->sc, result)) {
-                ret = (int)closure->sc->vptr->ffvalue(result);
+                ret = (long)closure->sc->vptr->ffvalue(result);
         }
 
         return ret;
--- src/tick.c.64bit	2006-02-13 18:17:08.352563117 -0600
+++ src/tick.c	2006-02-13 18:17:49.066410264 -0600
@@ -37,7 +37,7 @@
 	int msecs;
 	SDL_Event tick_event;
 
-        msecs = (int)data;
+        msecs = (long)data;
 	tick_event.type = SDL_USEREVENT;
 	tick_event.user.code = TICK_EVENT;