diff options
-rw-r--r-- | libguile/ChangeLog | 10 | ||||
-rw-r--r-- | libguile/__scm.h | 43 | ||||
-rw-r--r-- | libguile/async.c | 12 |
3 files changed, 11 insertions, 54 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index d23895fc9..169b48508 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,15 @@ 2000-06-29 Dirk Herrmann <D.Herrmann@tu-bs.de> + * __scm.h: Removed some commented code and fixed some comments. + + (SCM_HUP_SIGNAL, SCM_INT_SIGNAL, SCM_FPE_SIGNAL, SCM_BUS_SIGNAL, + SCM_SEGV_SIGNAL, SCM_ALRM_SIGNAL, SCM_GC_SIGNAL, SCM_TICK_SIGNAL, + SCM_SIG_ORD, SCM_ORD_SIG, SCM_NUM_SIGS): Removed. + + * async.c: Removed some commented code. + +2000-06-29 Dirk Herrmann <D.Herrmann@tu-bs.de> + * gc.c (scm_gc_mark, scm_gc_sweep, scm_must_malloc, scm_must_realloc, scm_must_free, alloc_some_heap): Use the appropriate error signalling function. diff --git a/libguile/__scm.h b/libguile/__scm.h index 556e408e5..a3c3093f3 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -550,54 +550,15 @@ extern SCM scm_apply_generic (SCM gf, SCM args); #define SCM_ARG5 5 #define SCM_ARG6 6 #define SCM_ARG7 7 - /* #define SCM_ARGERR(X) ((X) < SCM_WNA \ - ? (char *)(X) \ - : "wrong type argument") - */ -/* Following must match entry indexes in scm_errmsgs[]. - * Also, SCM_WNA must follow the last SCM_ARGn in sequence. +/* SCM_WNA must follow the last SCM_ARGn in sequence. */ #define SCM_WNA 8 - /* #define SCM_OVSCM_FLOW 9 */ #define SCM_OUTOFRANGE 10 #define SCM_NALLOC 11 - /* #define SCM_STACK_OVFLOW 12 */ - /* #define SCM_EXIT 13 */ #endif /* SCM_MAGIC_SNARFER */ -/* (...still matching scm_errmsgs) These - * are signals. Signals may become errors - * but are distinguished because they first - * try to invoke a handler that can resume - * the interrupted routine. - */ -#define SCM_HUP_SIGNAL 14 -#define SCM_INT_SIGNAL 15 -#define SCM_FPE_SIGNAL 16 -#define SCM_BUS_SIGNAL 17 -#define SCM_SEGV_SIGNAL 18 -#define SCM_ALRM_SIGNAL 19 -#define SCM_GC_SIGNAL 20 -#define SCM_TICK_SIGNAL 21 - -#define SCM_SIG_ORD(X) ((X) - SCM_HUP_SIGNAL) -#define SCM_ORD_SIG(X) ((X) + SCM_HUP_SIGNAL) -#define SCM_NUM_SIGS (SCM_SIG_ORD (SCM_TICK_SIGNAL) + 1) - -#if 0 -struct errdesc -{ - char *msg; - char *s_response; - short parent_err; -}; - - -extern struct errdesc scm_errmsgs[]; -#endif - /* SCM_EXIT_SUCCESS is the default code to return from SCM if no errors @@ -621,8 +582,6 @@ extern struct errdesc scm_errmsgs[]; #endif /* def vms */ #endif /* ndef SCM_EXIT_FAILURE */ - - #endif /* __SCMH */ diff --git a/libguile/async.c b/libguile/async.c index b04796cd7..7c16cdddb 100644 --- a/libguile/async.c +++ b/libguile/async.c @@ -142,14 +142,6 @@ scm_asyncs_pending () return 0; } -#if 0 -static SCM -scm_sys_tick_async_thunk (void) -{ - scm_deliver_signal (SCM_TICK_SIGNAL); - return SCM_BOOL_F; -} -#endif void scm_async_click () @@ -228,10 +220,6 @@ scm_async_click () } } - /* - if (owe_tick) - scm_async_mark (system_signal_asyncs[SCM_SIG_ORD(SCM_TICK_SIGNAL)]); */ - SCM_DEFER_INTS; if (scm_tick_rate && scm_switch_rate) { |