Index: raster/Makefile
===================================================================
--- raster/Makefile	(revision 40917)
+++ raster/Makefile	(working copy)
@@ -127,7 +127,7 @@
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-ifndef MINGW
+ifneq ($(strip $(MINGW)),)
     SUBDIRS += r.li
 endif
 
Index: lib/g3d/g3dcache.c
===================================================================
--- lib/g3d/g3dcache.c	(revision 40878)
+++ lib/g3d/g3dcache.c	(working copy)
@@ -121,7 +121,7 @@
 	return 0;
     }
 
-    index = *((int *)(xdr + nBytes));
+    index = *((int *)((unsigned char *)xdr + nBytes));
     map->index[index] = -pos - 2;
 
     map->cachePosLast--;