# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1183489386 -7200
# Node ID 719f55c4c376582c2e2a3d3089682ded80ccf736
# Parent  83190e511280522280f3b44066d4b594efb0150e# Parent  51f4d4491b44be4d7a79598c3dad4d9c865b16eb
merge

diff -r 83190e511280 -r 719f55c4c376 build_mingw_cross_env.sh
--- a/build_mingw_cross_env.sh	Tue Jul 03 16:41:31 2007 +0200
+++ b/build_mingw_cross_env.sh	Tue Jul 03 21:03:06 2007 +0200
@@ -82,7 +82,7 @@
 
 PATH="$PREFIX/bin:$PATH"
 
-VERSION_mingw_runtime=3.9
+VERSION_mingw_runtime=3.12
 VERSION_w32api=3.9
 VERSION_binutils=2.17.50-20060824-1
 VERSION_gcc=3.4.5-20060117-1
@@ -1571,6 +1571,9 @@
     tar xfvj "$DOWNLOAD/geos-$VERSION_geos.tar.bz2"
     cd "geos-$VERSION_geos"
     $SED 's,-lgeos,-lgeos -lstdc++,' -i tools/geos-config.in
+    # timezone and gettimeofday are in <time.h> since MinGW runtime 3.10
+    $SED 's,struct timezone {,struct timezone_disabled {,' -i source/headers/geos/timeval.h
+    $SED 's,int gettimeofday,int gettimeofday_disabled,'   -i source/headers/geos/timeval.h
     ./configure \
         --host="$TARGET" \
         --disable-shared \