HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "with a threaded guile, lock weak sets and tables during a fork"
[bpt/guile.git]
/
libguile
/
stackchk.h
diff --git
a/libguile/stackchk.h
b/libguile/stackchk.h
index
6aa0fec
..
1ed170f
100644
(file)
--- a/
libguile/stackchk.h
+++ b/
libguile/stackchk.h
@@
-3,7
+3,7
@@
#ifndef SCM_STACKCHK_H
#define SCM_STACKCHK_H
#ifndef SCM_STACKCHK_H
#define SCM_STACKCHK_H
-/* Copyright (C) 1995,1996,1998,2000, 2003, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000, 2003, 2006, 2008
, 2009, 2010, 2011
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 License
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@
-34,15
+34,14
@@
*/
#define SCM_STACK_CHECKING_P SCM_STACK_LIMIT
*/
#define SCM_STACK_CHECKING_P SCM_STACK_LIMIT
-#ifdef STACK_CHECKING
+#if defined BUILDING_LIBGUILE
+#include "libguile/private-options.h"
# if SCM_STACK_GROWS_UP
# define SCM_STACK_OVERFLOW_P(s)\
# if SCM_STACK_GROWS_UP
# define SCM_STACK_OVERFLOW_P(s)\
- (SCM_STACK_PTR (s) \
- > (SCM_I_CURRENT_THREAD->base + SCM_STACK_LIMIT))
+ ((SCM_STACK_PTR (s) - SCM_I_CURRENT_THREAD->base) > SCM_STACK_LIMIT)
# else
# define SCM_STACK_OVERFLOW_P(s)\
# else
# define SCM_STACK_OVERFLOW_P(s)\
- (SCM_STACK_PTR (s) \
- < (SCM_I_CURRENT_THREAD->base - SCM_STACK_LIMIT))
+ ((SCM_I_CURRENT_THREAD->base - SCM_STACK_PTR (s)) > SCM_STACK_LIMIT)
# endif
# define SCM_CHECK_STACK\
{\
# endif
# define SCM_CHECK_STACK\
{\
@@
-52,7
+51,7
@@
}
#else
# define SCM_CHECK_STACK /**/
}
#else
# define SCM_CHECK_STACK /**/
-#endif
/* STACK_CHECKING */
+#endif
SCM_API int scm_stack_checking_enabled_p;
SCM_API int scm_stack_checking_enabled_p;