summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-06 21:57:16 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-06 21:57:16 +0000
commita259db72b72c9cdf1059c15f6c99fdab3fbfc1a7 (patch)
tree43e7ab2e3587d3d96da1b8526cf51d53c9968de8
parent17448159357cddaf7e5a6ab5ad7e0f6a6f233d3f (diff)
* cont.c (FIBER_STACK_FLAGS): workaround fix for r32420 on FreeBSD.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--cont.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 19e674a..6381326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 7 06:56:15 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * cont.c (FIBER_STACK_FLAGS): workaround fix for r32420 on FreeBSD.
+
Thu Jul 7 06:46:12 2011 Eric Hodel <drbrain@segment7.net>
* benchmark/driver.rb: Add difference column to report that averages
diff --git a/cont.c b/cont.c
index adf975b..37c301a 100644
--- a/cont.c
+++ b/cont.c
@@ -517,7 +517,7 @@ fiber_entry(void *arg)
}
#else /* _WIN32 */
-#ifdef MAP_STACK
+#if defined(MAP_STACK) && !defined(__FreeBSD__)
#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
#else
#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)