From a4c5239364907da86b40beb85a7b3dd66177a09e Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 14 Aug 2008 01:07:37 +0000 Subject: [PATCH] fix scheme_current_thread schemef decl svn: r11233 --- src/mzscheme/include/mzscheme.exp | 4 +++- src/mzscheme/include/mzscheme3m.exp | 4 +++- src/mzscheme/include/mzwin.def | 3 +++ src/mzscheme/include/mzwin3m.def | 3 +++ src/mzscheme/src/makex | 3 +++ src/mzscheme/src/schemef.h | 4 +++- src/mzscheme/src/schemex.h | 4 +++- src/mzscheme/src/schemex.inc | 4 +++- src/mzscheme/src/schemexm.h | 4 +++- 9 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/mzscheme/include/mzscheme.exp b/src/mzscheme/include/mzscheme.exp index 19a8665cb8..afa793c9ed 100644 --- a/src/mzscheme/include/mzscheme.exp +++ b/src/mzscheme/include/mzscheme.exp @@ -15,8 +15,10 @@ scheme_set_thread_param scheme_get_env scheme_inherit_cells scheme_current_break_cell -Scheme_Thread +scheme_current_thread scheme_fuel_counter +scheme_current_thread_ptr +scheme_fuel_counter_ptr scheme_get_current_thread scheme_start_atomic scheme_end_atomic diff --git a/src/mzscheme/include/mzscheme3m.exp b/src/mzscheme/include/mzscheme3m.exp index 971a4f841f..6f9675d73d 100644 --- a/src/mzscheme/include/mzscheme3m.exp +++ b/src/mzscheme/include/mzscheme3m.exp @@ -15,8 +15,10 @@ scheme_set_thread_param scheme_get_env scheme_inherit_cells scheme_current_break_cell -Scheme_Thread +scheme_current_thread scheme_fuel_counter +scheme_current_thread_ptr +scheme_fuel_counter_ptr scheme_get_current_thread scheme_start_atomic scheme_end_atomic diff --git a/src/mzscheme/include/mzwin.def b/src/mzscheme/include/mzwin.def index 58a3676e3e..9a92ba439e 100644 --- a/src/mzscheme/include/mzwin.def +++ b/src/mzscheme/include/mzwin.def @@ -17,7 +17,10 @@ EXPORTS scheme_get_env scheme_inherit_cells scheme_current_break_cell + scheme_current_thread DATA scheme_fuel_counter DATA + scheme_current_thread_ptr DATA + scheme_fuel_counter_ptr DATA scheme_get_current_thread scheme_start_atomic scheme_end_atomic diff --git a/src/mzscheme/include/mzwin3m.def b/src/mzscheme/include/mzwin3m.def index 4008fe688f..26e1b77970 100644 --- a/src/mzscheme/include/mzwin3m.def +++ b/src/mzscheme/include/mzwin3m.def @@ -17,7 +17,10 @@ EXPORTS scheme_get_env scheme_inherit_cells scheme_current_break_cell + scheme_current_thread DATA scheme_fuel_counter DATA + scheme_current_thread_ptr DATA + scheme_fuel_counter_ptr DATA scheme_get_current_thread scheme_start_atomic scheme_end_atomic diff --git a/src/mzscheme/src/makex b/src/mzscheme/src/makex index b47a8fba8b..61a3c84236 100755 --- a/src/mzscheme/src/makex +++ b/src/mzscheme/src/makex @@ -33,6 +33,9 @@ while (<>) { if ($_ =~ /^MZ_EXTERN /) { $_ = substr($_, 10); } + if ($_ =~ /^THREAD_LOCAL /) { + $_ = substr($_, 13); + } if ($_ =~ /^volatile /) { $_ = substr($_, 9); diff --git a/src/mzscheme/src/schemef.h b/src/mzscheme/src/schemef.h index 620ae730d0..d9db328df1 100644 --- a/src/mzscheme/src/schemef.h +++ b/src/mzscheme/src/schemef.h @@ -68,7 +68,9 @@ MZ_EXTERN Scheme_Object *scheme_current_break_cell(); /*========================================================================*/ #ifndef LINK_EXTENSIONS_BY_TABLE -extern THREAD_LOCAL Scheme_Thread *scheme_current_thread; +# ifndef MZ_USE_PLACES +MZ_EXTERN THREAD_LOCAL Scheme_Thread *scheme_current_thread; +# endif MZ_EXTERN volatile int scheme_fuel_counter; #else MZ_EXTERN Scheme_Thread **scheme_current_thread_ptr; diff --git a/src/mzscheme/src/schemex.h b/src/mzscheme/src/schemex.h index 3fcde19393..f278b6ba53 100644 --- a/src/mzscheme/src/schemex.h +++ b/src/mzscheme/src/schemex.h @@ -54,7 +54,9 @@ Scheme_Object *(*scheme_current_break_cell)(); /* threads */ /*========================================================================*/ #ifndef LINK_EXTENSIONS_BY_TABLE -THREAD_LOCAL Scheme_Thread; +# ifndef MZ_USE_PLACES +Scheme_Thread *scheme_current_thread; +# endif volatile int scheme_fuel_counter; #else Scheme_Thread **scheme_current_thread_ptr; diff --git a/src/mzscheme/src/schemex.inc b/src/mzscheme/src/schemex.inc index d8cb32ccc4..53e0c90c88 100644 --- a/src/mzscheme/src/schemex.inc +++ b/src/mzscheme/src/schemex.inc @@ -19,7 +19,9 @@ scheme_extension_table->scheme_inherit_cells = scheme_inherit_cells; scheme_extension_table->scheme_current_break_cell = scheme_current_break_cell; #ifndef LINK_EXTENSIONS_BY_TABLE - scheme_extension_table->Scheme_Thread = Scheme_Thread; +# ifndef MZ_USE_PLACES + scheme_extension_table->scheme_current_thread = scheme_current_thread; +# endif scheme_extension_table->scheme_fuel_counter = scheme_fuel_counter; #else scheme_extension_table->scheme_current_thread_ptr = scheme_current_thread_ptr; diff --git a/src/mzscheme/src/schemexm.h b/src/mzscheme/src/schemexm.h index 98411faf50..3a6577c66f 100644 --- a/src/mzscheme/src/schemexm.h +++ b/src/mzscheme/src/schemexm.h @@ -19,7 +19,9 @@ #define scheme_inherit_cells (scheme_extension_table->scheme_inherit_cells) #define scheme_current_break_cell (scheme_extension_table->scheme_current_break_cell) #ifndef LINK_EXTENSIONS_BY_TABLE -#define Scheme_Thread (scheme_extension_table->Scheme_Thread) +# ifndef MZ_USE_PLACES +#define scheme_current_thread (scheme_extension_table->scheme_current_thread) +# endif #define scheme_fuel_counter (scheme_extension_table->scheme_fuel_counter) #else #define scheme_current_thread_ptr (scheme_extension_table->scheme_current_thread_ptr)