~ chicken-core (chicken-5) 8181fe9b6a29a40dcffbe3389a8f7bd04564c445
commit 8181fe9b6a29a40dcffbe3389a8f7bd04564c445 Author: felix <felix@call-with-current-continuation.org> AuthorDate: Sun Oct 21 20:48:48 2012 +0200 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Sun Oct 21 20:48:48 2012 +0200 new is a C++ keyword diff --git a/runtime.c b/runtime.c index d8f94ed5..df27e315 100644 --- a/runtime.c +++ b/runtime.c @@ -4290,19 +4290,19 @@ C_regparm C_word C_fcall C_establish_signal_handler(C_word signum, C_word reason { int sig = C_unfix(signum); #if defined(HAVE_SIGACTION) - struct sigaction new; + struct sigaction newsig; - new.sa_flags = 0; - sigemptyset(&new.sa_mask); + newsig.sa_flags = 0; + sigemptyset(&newsig.sa_mask); #endif if(reason == C_SCHEME_FALSE) C_signal(sig, SIG_IGN); else { signal_mapping_table[ sig ] = C_unfix(reason); #if defined(HAVE_SIGACTION) - sigaddset(&new.sa_mask, sig); - new.sa_handler = global_signal_handler; - C_sigaction(sig, &new, NULL); + sigaddset(&newsig.sa_mask, sig); + newsig.sa_handler = global_signal_handler; + C_sigaction(sig, &newsig, NULL); #else C_signal(sig, global_signal_handler); #endif @@ -8244,7 +8244,7 @@ void dload_2(void *dummy) void C_ccall C_become(C_word c, C_word closure, C_word k, C_word table) { - C_word tp, x, old, new, i, *p; + C_word tp, x, old, neu, i, *p; i = forwarding_table_size; p = forwarding_table; @@ -8252,7 +8252,7 @@ void C_ccall C_become(C_word c, C_word closure, C_word k, C_word table) for(tp = table; tp != C_SCHEME_END_OF_LIST; tp = C_u_i_cdr(tp)) { x = C_u_i_car(tp); old = C_u_i_car(x); - new = C_u_i_cdr(x); + neu = C_u_i_cdr(x); if(i == 0) { if((forwarding_table = (C_word *)realloc(forwarding_table, (forwarding_table_size + 1) * 4 * sizeof(C_word))) == NULL) @@ -8264,7 +8264,7 @@ void C_ccall C_become(C_word c, C_word closure, C_word k, C_word table) } *(p++) = old; - *(p++) = new; + *(p++) = neu; --i; }Trap