From 7130cea2bf31f93f281957e2b529df99444bdd53 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Tue, 6 Sep 2005 06:31:04 +0000
Subject: [PATCH] Minor MingW patches backported from dev branch.

---
 CHANGELOG        | 1 +
 configure.in     | 5 +++++
 platform/win32.c | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9fe2dfc6..e7200d9d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+09062005 - Happy September. Minor MingW fixes (but it's still broken, I think).
 07232005 - Fixed bug in zip archiver (thanks, Jörg Walter!). Updated zlib to
            1.2.3, which properly includes the security fix. Fixed "make dist"
            to handle .svn dirs and other file changes. Removed "debian"
diff --git a/configure.in b/configure.in
index 541a4785..c082e60f 100644
--- a/configure.in
+++ b/configure.in
@@ -383,8 +383,13 @@ fi
 AC_MSG_RESULT([$this_is_cygwin])
 
 AC_MSG_CHECKING([if this is mingw])
+if test x$target_os = xmingw32; then
+  this_is_mingw=yes
+fi
 if test x$target_os = xmingw32msvc; then
   this_is_mingw=yes
+fi
+if test x$this_is_mingw = xyes; then
   PHYSFSCFLAGS="$PHYSFSCFLAGS -DWIN32"
   enable_cdrom=yes
   enable_pthreads=no
diff --git a/platform/win32.c b/platform/win32.c
index 762054aa..300376fe 100644
--- a/platform/win32.c
+++ b/platform/win32.c
@@ -25,7 +25,7 @@
 
 #if (defined _MSC_VER)
     #define alloca(x) _alloca(x)
-#elif (defined MINGW)  /* scary...hopefully this is okay. */
+#elif (defined __MINGW32__)  /* scary...hopefully this is okay. */
     #define alloca(x) __builtin_alloca(x) 
 #endif