Fixed use of finalizers for guardians and SMOBs (undoes patches 23-24).

[bpt/guile.git] / libguile / stackchk.h

diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index 44f5c7c..9a5c59f 100644 (file)
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -3,7 +3,7 @@
 #ifndef SCM_STACKCHK_H
 #define SCM_STACKCHK_H
 
-/* Copyright (C) 1995,1996,1998,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000, 2003, 2006 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 \f
@@ -36,10 +36,12 @@
 #ifdef STACK_CHECKING
 # if SCM_STACK_GROWS_UP
 #  define SCM_STACK_OVERFLOW_P(s)\
-   (s > ((SCM_STACKITEM *) SCM_BASE (scm_rootcont) + SCM_STACK_LIMIT))
+   (SCM_STACK_PTR (s) \
+    > (SCM_I_CURRENT_THREAD->base + SCM_STACK_LIMIT))
 # else
 #  define SCM_STACK_OVERFLOW_P(s)\
-   (s < ((SCM_STACKITEM *) SCM_BASE (scm_rootcont) - SCM_STACK_LIMIT))
+   (SCM_STACK_PTR (s) \
+    < (SCM_I_CURRENT_THREAD->base - SCM_STACK_LIMIT))
 # endif
 # define SCM_CHECK_STACK\
     {\