diff --git a/src/racket/src/place.c b/src/racket/src/place.c index baa4868e7a..18e9fc8200 100644 --- a/src/racket/src/place.c +++ b/src/racket/src/place.c @@ -135,14 +135,7 @@ void scheme_init_place(Scheme_Env *env) PLACE_PRIM_W_ARITY("place-message-allowed?", place_allowed_p, 1, 1, plenv); PLACE_PRIM_W_ARITY("place-dead-evt", make_place_dead, 1, 1, plenv); -#ifdef MZ_USE_PLACES - REGISTER_SO(scheme_def_place_exit_proc); - scheme_def_place_exit_proc = scheme_make_prim_w_arity(def_place_exit_handler_proc, "default-place-exit-handler", 1, 1); -#endif scheme_finish_primitive_module(plenv); - - REGISTER_SO(quote_symbol); - quote_symbol = scheme_intern_symbol("quote"); } static Scheme_Object* scheme_place_enabled(int argc, Scheme_Object *args[]) { @@ -159,7 +152,12 @@ void scheme_init_places_once() { scheme_add_evt(scheme_place_bi_channel_type, (Scheme_Ready_Fun)place_channel_ready, NULL, NULL, 1); scheme_add_evt(scheme_place_dead_type, (Scheme_Ready_Fun)place_dead_ready, NULL, NULL, 1); mzrt_mutex_create(&id_counter_mutex); + REGISTER_SO(scheme_def_place_exit_proc); + scheme_def_place_exit_proc = scheme_make_prim_w_arity(def_place_exit_handler_proc, "default-place-exit-handler", 1, 1); #endif + + REGISTER_SO(quote_symbol); + quote_symbol = scheme_intern_symbol("quote"); } int scheme_get_place_id(void) diff --git a/src/racket/src/portfun.c b/src/racket/src/portfun.c index b0757f1900..30ac39653e 100644 --- a/src/racket/src/portfun.c +++ b/src/racket/src/portfun.c @@ -330,6 +330,10 @@ scheme_init_port_fun(Scheme_Env *env) scheme_add_global_constant("print", scheme_print_proc, env); GLOBAL_IMMED_PRIM("pipe-content-length", pipe_length, 1, 1, env); + + REGISTER_SO(scheme_default_global_print_handler); + scheme_default_global_print_handler + = scheme_make_prim_w_arity(sch_default_global_port_print_handler, "default-global-port-print-handler", 2, 3); } @@ -350,9 +354,6 @@ void scheme_init_port_fun_config(void) scheme_set_root_param(MZCONFIG_LOAD_HANDLER, dlh); } - REGISTER_SO(scheme_default_global_print_handler); - scheme_default_global_print_handler - = scheme_make_prim_w_arity(sch_default_global_port_print_handler, "default-global-port-print-handler", 2, 3); scheme_set_root_param(MZCONFIG_PORT_PRINT_HANDLER, scheme_default_global_print_handler); /* Use dummy port: */