aboutsummaryrefslogtreecommitdiffstats
path: root/gc.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-18 02:08:56 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-18 02:08:56 +0000
commite91baf5634c419247a176f60e399a9446ff2ccf7 (patch)
treef36510ed205bbaf5f05639a4928aa9ea370ee44b /gc.c
parenta923a6f04c779e85787cfee6207ed8b0ae0e4070 (diff)
downloadruby-e91baf5634c419247a176f60e399a9446ff2ccf7.tar.gz
* dln.c: simplify #ifdef. _WIN32 and __CYGWIN__ are exclusive.
see include/ruby/defines.h * gc.c: ditto. * ext/sdbm/_sdbm.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gc.c b/gc.c
index 4f2f781123..42a5a64e2f 100644
--- a/gc.c
+++ b/gc.c
@@ -7419,7 +7419,7 @@ aligned_malloc(size_t alignment, size_t size)
#if defined __MINGW32__
res = __mingw_aligned_malloc(size, alignment);
-#elif defined _WIN32 && !defined __CYGWIN__
+#elif defined _WIN32
void *_aligned_malloc(size_t, size_t);
res = _aligned_malloc(size, alignment);
#elif defined(HAVE_POSIX_MEMALIGN)
@@ -7453,7 +7453,7 @@ aligned_free(void *ptr)
{
#if defined __MINGW32__
__mingw_aligned_free(ptr);
-#elif defined _WIN32 && !defined __CYGWIN__
+#elif defined _WIN32
_aligned_free(ptr);
#elif defined(HAVE_MEMALIGN) || defined(HAVE_POSIX_MEMALIGN)
free(ptr);