summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-08 02:59:04 +0000
committernari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-08 02:59:04 +0000
commitcd73f29465310e55f36e001a7964f4be3d2a833a (patch)
treed84449a8b03a224cab5d0b116fd9fd850dc64dfc
parent94fd32b80a585750427836a1e22d05c0ee3d09ad (diff)
* gc.c (aligned_free): support MinGW. Patch by Hiroshi Shirosaki.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index beb5b0cf93..8c1e98347e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 8 11:54:43 2012 Narihiro Nakamura <authornari@gmail.com>
+
+ * gc.c (aligned_free): support MinGW. Patch by Hiroshi Shirosaki.
+
Sun Jan 8 11:43:05 2012 Narihiro Nakamura <authornari@gmail.com>
* gc.c (slot_sweep): add a assertion instead of a debug print.
diff --git a/gc.c b/gc.c
index c2a1a7c6fd..b5c0094868 100644
--- a/gc.c
+++ b/gc.c
@@ -1081,7 +1081,9 @@ aligned_malloc(size_t aligned_size)
static void
aligned_free(void *ptr)
{
-#if _WIN32 || defined __CYGWIN__
+#if __MINGW32__
+ __mingw_aligned_free(ptr);
+#elif _WIN32 || defined __CYGWIN__
_aligned_free(ptr);
#else
free(ptr);