From cd73f29465310e55f36e001a7964f4be3d2a833a Mon Sep 17 00:00:00 2001 From: nari Date: Sun, 8 Jan 2012 02:59:04 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ gc.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * gc.c (aligned_free): support MinGW. Patch by Hiroshi Shirosaki. + Sun Jan 8 11:43:05 2012 Narihiro Nakamura * 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);