diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
| commit | 856d318a9f543d8a61fcf61caae7d07102586802 (patch) | |
| tree | 10bd99500c027bbd472253f6cc34f8b1b516d4a1 /libguile/debug.c | |
| parent | f7582f9807d9a10fba86f54c4aeaa7444c51a315 (diff) | |
| parent | 3157d455039f137ca5dfa8b9fbc4a3404ce00606 (diff) | |
| download | guile-856d318a9f543d8a61fcf61caae7d07102586802.tar.gz | |
Merge branch 'stable-2.0'
Conflicts:
benchmark-suite/benchmarks/ports.bm
libguile/async.h
libguile/bytevectors.c
libguile/foreign.c
libguile/gsubr.c
libguile/srfi-1.c
libguile/vm-engine.h
libguile/vm-i-scheme.c
module/Makefile.am
module/language/tree-il/analyze.scm
module/language/tree-il/peval.scm
module/scripts/compile.scm
module/scripts/disassemble.scm
test-suite/tests/asm-to-bytecode.test
test-suite/tests/peval.test
test-suite/tests/rdelim.test
Diffstat (limited to 'libguile/debug.c')
| -rw-r--r-- | libguile/debug.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libguile/debug.c b/libguile/debug.c index f9bcc33db..878777d56 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -27,6 +27,11 @@ #include <sys/resource.h> #endif +#ifdef __MINGW32__ +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +#endif + #include "libguile/_scm.h" #include "libguile/async.h" #include "libguile/eval.h" @@ -180,7 +185,7 @@ scm_local_eval (SCM exp, SCM env) static void init_stack_limit (void) { -#ifdef HAVE_GETRLIMIT +#if defined HAVE_GETRLIMIT struct rlimit lim; if (getrlimit (RLIMIT_STACK, &lim) == 0) { @@ -194,6 +199,16 @@ init_stack_limit (void) SCM_STACK_LIMIT = bytes * 8 / 10 / sizeof (scm_t_bits); } errno = 0; +#elif defined __MINGW32__ + MEMORY_BASIC_INFORMATION m; + uintptr_t bytes; + + if (VirtualQuery ((LPCVOID) &m, &m, sizeof m)) + { + bytes = (DWORD_PTR) m.BaseAddress + m.RegionSize + - (DWORD_PTR) m.AllocationBase; + SCM_STACK_LIMIT = bytes * 8 / 10 / sizeof (scm_t_bits); + } #endif } |