From 4b16c7616eec768369c52327aca52383369210a8 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 21 Dec 2012 05:18:39 -0700
Subject: [PATCH] mingw32: fix MSC-style underscore consistency

---
 src/racket/sconfig.h     | 7 +++++++
 src/racket/src/schpriv.h | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/racket/sconfig.h b/src/racket/sconfig.h
index 1a362ed5c3..2be96cb766 100644
--- a/src/racket/sconfig.h
+++ b/src/racket/sconfig.h
@@ -608,7 +608,14 @@
 /* MS Visual C++ likes underscore prefixes */
 #if defined(_MSC_VER)
 # define MSC_IZE(x) _ ## x
+# define M_MSC_IZE(x) MSC_IZE(x)
 # define DIRECT_INCLUDE
+# else
+# define M_MSC_IZE(x) x
+#endif
+
+#if defined(__MINGW32__)
+# define MSC_IZE(x) _ ## x
 #endif
 
 #ifdef __BORLANDC__
diff --git a/src/racket/src/schpriv.h b/src/racket/src/schpriv.h
index e961cc47d0..999a15904c 100644
--- a/src/racket/src/schpriv.h
+++ b/src/racket/src/schpriv.h
@@ -199,7 +199,7 @@ void scheme_clear_ephemerons(void);
 #define BITS_PER_MZSHORT (8 * sizeof(mzshort))
 
 #ifndef NO_INLINE_KEYWORD
-# define MZ_INLINE MSC_IZE(inline)
+# define MZ_INLINE M_MSC_IZE(inline)
 #else
 # define MZ_INLINE /* empty */
 #endif