summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-18 14:21:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-18 14:21:31 +0000
commite30dbb36718a3a1b6c5f7cd2701e46c9b4f285b9 (patch)
treededded425d73eda728f4639d335ddd804eb3e4f5 /gc.c
parent1d006f353d77d3f297c9ee42149eeca45bf90117 (diff)
fix condition for free
* gc.c (aligned_free): fix condition for free. memalign() and posix_memalign() are not defined together normally. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gc.c b/gc.c
index 538830e344..d260168088 100644
--- a/gc.c
+++ b/gc.c
@@ -1100,7 +1100,8 @@ aligned_malloc(size_t alignment, size_t size)
#elif defined(HAVE_POSIX_MEMALIGN)
if (posix_memalign(&res, alignment, size) == 0) {
return res;
- } else {
+ }
+ else {
return NULL;
}
#elif defined(HAVE_MEMALIGN)
@@ -1129,7 +1130,7 @@ aligned_free(void *ptr)
__mingw_aligned_free(ptr);
#elif defined _WIN32 && !defined __CYGWIN__
_aligned_free(ptr);
-#elif defined(HAVE_MEMALIGN) && defined(HAVE_POSIX_MEMALIGN)
+#elif defined(HAVE_MEMALIGN) || defined(HAVE_POSIX_MEMALIGN)
free(ptr);
#else
free(((void**)ptr)[-1]);