From bf8c1826b4b1f66a4c4f3ca7e31dda81cdc2e431 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 19 Nov 2009 22:41:49 +0000 Subject: [PATCH] fix non-future build svn: r16904 --- src/mzscheme/src/future.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/mzscheme/src/future.c b/src/mzscheme/src/future.c index 4f677ef804..52d513f3bf 100644 --- a/src/mzscheme/src/future.c +++ b/src/mzscheme/src/future.c @@ -23,6 +23,12 @@ static Scheme_Object *touch(int argc, Scheme_Object *argv[]) return NULL; } +static Scheme_Object *processor_count(int argc, Scheme_Object *argv[]) +{ + scheme_signal_error("processor-count: not enabled"); + return NULL; +} + # define FUTURE_PRIM_W_ARITY(name, func, a1, a2, env) GLOBAL_PRIM_W_ARITY(name, func, a1, a2, env) void scheme_init_futures(Scheme_Env *env) @@ -660,10 +666,10 @@ Scheme_Object *processor_count(int argc, Scheme_Object *argv[]) { int cpucount = 0; - #ifdef linux +#ifdef linux cpucount = sysconf(_SC_NPROCESSORS_ONLN); - #elif OS_X - nt mib[4]; +#elif OS_X + int mib[4]; size_t len; /* set the mib for hw.ncpu */ @@ -681,13 +687,13 @@ Scheme_Object *processor_count(int argc, Scheme_Object *argv[]) cpucount = 1; } } - #elif WINDOWS +#elif WINDOWS SYSTEM_INFO sysinfo; GetSystemInfo(&sysinfo); cpucount = sysinfo.dwNumberOfProcessors; - #else +#else cpucount = THREAD_POOL_SIZE; - #endif +#endif return scheme_make_integer(cpucount); }