summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-17 03:32:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-17 03:32:50 +0000
commite87c0e657422f5aea30d3b15a25a9895ff74d07a (patch)
treee4f338976a220579934ec5a9b587de51a96ff375 /gc.c
parente8590143a0606ce2f8f067ada24e4af4558deaf2 (diff)
* gc.c (aligned_malloc, aligned_free): covered missing defined
operators and fixes for cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gc.c b/gc.c
index 5aac9738e3..4c906e7ab2 100644
--- a/gc.c
+++ b/gc.c
@@ -1088,9 +1088,9 @@ aligned_malloc(size_t alignment, size_t size)
{
void *res;
-#if __MINGW32__
+#if defined __MINGW32__
res = __mingw_aligned_malloc(size, alignment);
-#elif _WIN32 || defined __CYGWIN__
+#elif defined _WIN32 && !defined __CYGWIN__
res = _aligned_malloc(size, alignment);
#elif defined(HAVE_POSIX_MEMALIGN)
if (posix_memalign(&res, alignment, size) == 0) {
@@ -1109,9 +1109,9 @@ aligned_malloc(size_t alignment, size_t size)
static void
aligned_free(void *ptr)
{
-#if __MINGW32__
+#if defined __MINGW32__
__mingw_aligned_free(ptr);
-#elif _WIN32 || defined __CYGWIN__
+#elif defined _WIN32 && !defined __CYGWIN__
_aligned_free(ptr);
#else
free(ptr);