aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-08 22:50:59 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-08 22:50:59 +0000
commit471394f647953117af078ce38ad61fc6b241cc42 (patch)
tree7c41d931bf6192ccb133abeac8bf938663bdb832
parent88b16cebc818a75f36005f25998ea1a2e35fdfee (diff)
downloadruby-471394f647953117af078ce38ad61fc6b241cc42.tar.gz
* gc.c: i686-linux needs to define _XOPEN_SOURCE 600 for posix_memalign.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 08c173b2b6..9812e25232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 9 07:46:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * gc.c: i686-linux needs to define _XOPEN_SOURCE 600 for posix_memalign.
+
Mon Jan 9 04:24:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
* gc.c (rb_objspace_free): global_List is allocated with xmalloc.
diff --git a/gc.c b/gc.c
index 11f303f449..af4f4cc5f7 100644
--- a/gc.c
+++ b/gc.c
@@ -36,9 +36,11 @@
#if defined _WIN32 || defined __CYGWIN__
#include <windows.h>
-#endif
-
-#if !defined(__MINGW32__) && !defined(_WIN32) && !defined(__CYGWIN__) &&!defined(HAVE_POSIX_MEMALIGN) &&defined(HAVE_MEMALIGN)
+#elif defined(HAVE_POSIX_MEMALIGN)
+# ifdef __linux__ /* i386 linux needs #define _XOPEN_SOURCE 600 to use posix_memalign */
+# define _XOPEN_SOURCE 600
+# endif
+#elif defined(HAVE_MEMALIGN)
#include <malloc.h>
#endif