* Merge r5629:6037 from libgcroots-trunk.

uim · Oct 26, 2009 · 35a1b00 · 35a1b00
1 parent 65baf64
commit 35a1b00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/autogen.sh b/autogen.sh
@@ -8,7 +8,7 @@ set -e
 # 1.7 caused weird am__remove_distdir on my env. So I made 1.10 most
 # preferable.  -- YamaKen 2006-12-25
 am_version=
-for v in 1.10 1.7 1.9 1.8; do
+for v in 1.11 1.10 1.7 1.9 1.8; do
     if type -p &>/dev/null automake-$v; then
 	am_version="-$v"
 	break

diff --git a/mach_dep.c b/mach_dep.c
@@ -160,7 +160,7 @@ void GC_push_regs()
 # undef HAVE_PUSH_REGS
 #endif
 
-#if !defined(HAVE_PUSH_REGS) && defined(UNIX_LIKE) && HAVE_GETCONTEXT
+#if !defined(HAVE_PUSH_REGS) && defined(UNIX_LIKE) && HAVE_GETCONTEXT && !defined(DARWIN)
 # include <ucontext.h>
 #endif