From: Rudi Schlatte <rudi@constantly.at>
Date: Sun, 23 Apr 2006 12:21:12 +0000 (+0000)
Subject: 0.9.11.46
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=83aafeb6d7a8ca3c6036b0b9d229785773b20e2d;p=sbcl.git

0.9.11.46
  Disable (non-working) stack guard page protection on win32
  ... No more VirtualProtect error 0x1e7
  ... thanks to Alastair Bridgewater and Yaroslav Kavenchuk
---

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index 11bb423..d218fd5 100644
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -588,6 +588,7 @@ steppers to maintain contextual information.")
                      ;; In the event of a control-stack-exhausted-error, we
                      ;; should have unwound enough stack by the time we get
                      ;; here that this is now possible.
+                     #!-win32
                      (sb!kernel::protect-control-stack-guard-page 1)
                      (funcall repl-fun noprint)
                      (critically-unreachable "after REPL"))))))))))
diff --git a/src/runtime/thread.c b/src/runtime/thread.c
index 8d3d36a..bedab33 100644
--- a/src/runtime/thread.c
+++ b/src/runtime/thread.c
@@ -103,7 +103,9 @@ initial_thread_trampoline(struct thread *th)
     if(arch_os_thread_init(th)==0) return 1;
     link_thread(th);
     th->os_thread=thread_self();
+#ifndef LISP_FEATURE_WIN32
     protect_control_stack_guard_page(1);
+#endif
 
 #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
     return call_into_lisp_first_time(function,args,0);
diff --git a/version.lisp-expr b/version.lisp-expr
index 6e83ca2..af20b0d 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.11.45"
+"0.9.11.46"