Ticket #519: mingw_updated3.diff

raster/Makefile

@@ -40 +40 @@
         r.kappa \
         r.lake \
         r.le \
-        r.li \
         r.los \
         r.mapcalc \
         r.median \
@@ -128 +127 @@
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-ifneq ($(MINGW),)
+ifneq ($(strip $(MINGW)),)
     SUBDIRS += r.li
 endif
 

lib/g3d/g3dcache.c

@@ -121 +121 @@
         return 0;
     }
 
-    index = *((int *)(xdr + nBytes));
+    index = *((int *)((unsigned char *)xdr + nBytes));
     map->index[index] = -pos - 2;
 
     map->cachePosLast--;

lib/gis/spawn.c

@@ -204 +204 @@
 
 #ifdef __MINGW32__
 
-static int do_redirects(struct redirect *redirects, int num_redirects)
+static void do_redirects(struct redirect *redirects, int num_redirects)
 {
     if (num_redirects > 0)
         G_fatal_error

lib/gis/gdal.c

@@ -19 +19 @@
 # ifdef _WIN32
 #  include <windows.h>
 # endif
+# undef CPL_STDCALL
+# define CPL_STDCALL
 #endif
 
 static void CPL_STDCALL (*pGDALAllRegister)(void);
@@ -77 +79 @@
         "libgdal.so",
 # endif
 # ifdef _WIN32
+  "gdal16.dll",
+  "gdal15.dll",
         "gdal11.dll",
         "gdal.1.0.dll",
         "gdal.dll",