# 
# patch "ChangeLog"
#  from [eaae8a98d16b87f056537f2db7945a82bce8c7f9]
#    to [80ebdfc0f35e761ecca402b62494087ff4634f58]
# 
# patch "configure.ac"
#  from [84632e90c32942348f38e80ec5d0e47baed43ad4]
#    to [289e0cb6ea26e1a8e515e7f81626a49e77381d69]
# 
# patch "main.cc"
#  from [0f905ade02dd9188922f3c04700501c6f7d4b57d]
#    to [04b5953af7882face258ff6ddca883b341eacaad]
# 
========================================================================
--- ChangeLog	eaae8a98d16b87f056537f2db7945a82bce8c7f9
+++ ChangeLog	80ebdfc0f35e761ecca402b62494087ff4634f58
@@ -1,3 +1,9 @@
+2005-09-05  Matthew Gregan  <address@hidden>
+
+	* main.cc: Tweak #ifdef to avoid exposing some unused SEH handling
+	on MinGW.
+	* configure.ac: Minor cleanup to Win32 configure test.
+
 2005-09-04  Grahame Bowland  <address@hidden>
 
 	* commands.cc: siplify the monotone cat command 
========================================================================
--- configure.ac	84632e90c32942348f38e80ec5d0e47baed43ad4
+++ configure.ac	289e0cb6ea26e1a8e515e7f81626a49e77381d69
@@ -254,12 +254,15 @@
 __wont_compile_
 #endif
 ],
-   AM_CONDITIONAL(WIN32_PLATFORM, true),
-   AM_CONDITIONAL(WIN32_PLATFORM, false),
+        ac_win32=yes,
+        ac_win32=no,
+        ac_win32=no)])
+if test "$ac_win32" = "yes"; then
+   AM_CONDITIONAL(WIN32_PLATFORM, true)
+else
    AM_CONDITIONAL(WIN32_PLATFORM, false)
-)])
+fi
 
-
 # Check for IPv6.  Let the user enable or disable it manually using a
 # three-state (yes|no|auto) --enable argument.
 AC_ARG_ENABLE(ipv6,
========================================================================
--- main.cc	0f905ade02dd9188922f3c04700501c6f7d4b57d
+++ main.cc	04b5953af7882face258ff6ddca883b341eacaad
@@ -124,7 +124,7 @@
 }
 #endif
 
-#ifdef MS_STRUCTURED_EXCEPTION_HANDLING
+#if defined(MS_STRUCTURED_EXCEPTION_HANDLING) && !defined(__BORLANDC__) && !defined(__MINGW32__)
 struct
 ms_se_exception 
 {