summaryrefslogtreecommitdiff
path: root/libguile/scmsigs.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-08-02 16:14:04 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-08-02 16:14:04 +0000
commitb9bd8526f055eeef0acc42c269eb5ec67546159f (patch)
treef2561facb5d3a08f72839a166e89eda9e7b4136e /libguile/scmsigs.c
parent531bf3e6a84faf61107b4a8a5288a2a757d17c6e (diff)
downloadguile-b9bd8526f055eeef0acc42c269eb5ec67546159f.tar.gz
* numbers.h, numbers.c, discouraged.h, discouraged.c (scm_short2num,
scm_ushort2num, scm_int2num, scm_uint2num, scm_long2num, scm_ulong2num, scm_size2num, scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint, scm_num2long, scm_num2ulong, scm_num2size, scm_num2ptrdiff, scm_long_long2num, scm_ulong_long2num, scm_num2long_long, scm_num2ulong_long): Discouraged by moving to discouraged.h and discouraged.c and reimplementing in terms of scm_from_* and scm_to_*. Changed all uses to the new scm_from_* and scm_to_* functions.
Diffstat (limited to 'libguile/scmsigs.c')
-rw-r--r--libguile/scmsigs.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 3591f3a63..1b9aa0724 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -223,7 +223,7 @@ really_install_handler (void *data)
{
SCM_VECTOR_SET (*signal_handlers, signum, handler);
SCM_VECTOR_SET (signal_cell_handlers, signum,
- close_1 (handler, scm_int2num (signum)));
+ close_1 (handler, scm_from_int (signum)));
}
/* Now fix up the cell. It might contain the old handler but since
@@ -424,7 +424,7 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
orig_handlers[csig] = old_action;
}
if (old_action.sa_handler == SIG_DFL || old_action.sa_handler == SIG_IGN)
- old_handler = scm_long2num ((long) old_action.sa_handler);
+ old_handler = scm_from_long ((long) old_action.sa_handler);
SCM_ALLOW_INTS;
return scm_cons (old_handler, scm_from_int (old_action.sa_flags));
#else
@@ -443,7 +443,7 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
orig_handlers[csig] = old_chandler;
}
if (old_chandler == SIG_DFL || old_chandler == SIG_IGN)
- old_handler = scm_long2num ((long) old_chandler);
+ old_handler = scm_from_long ((long) old_chandler);
SCM_ALLOW_INTS;
return scm_cons (old_handler, scm_from_int (0));
#endif
@@ -536,10 +536,10 @@ SCM_DEFINE (scm_setitimer, "setitimer", 5, 0, 0,
if(rv != 0)
SCM_SYSERROR;
- return scm_list_2(scm_cons(scm_long2num(old_timer.it_interval.tv_sec),
- scm_long2num(old_timer.it_interval.tv_usec)),
- scm_cons(scm_long2num(old_timer.it_value.tv_sec),
- scm_long2num(old_timer.it_value.tv_usec)));
+ return scm_list_2 (scm_cons (scm_from_long (old_timer.it_interval.tv_sec),
+ scm_from_long (old_timer.it_interval.tv_usec)),
+ scm_cons (scm_from_long (old_timer.it_value.tv_sec),
+ scm_from_long (old_timer.it_value.tv_usec)));
}
#undef FUNC_NAME
#endif /* HAVE_SETITIMER */
@@ -572,10 +572,10 @@ SCM_DEFINE (scm_getitimer, "getitimer", 1, 0, 0,
if(rv != 0)
SCM_SYSERROR;
- return scm_list_2(scm_cons(scm_long2num(old_timer.it_interval.tv_sec),
- scm_long2num(old_timer.it_interval.tv_usec)),
- scm_cons(scm_long2num(old_timer.it_value.tv_sec),
- scm_long2num(old_timer.it_value.tv_usec)));
+ return scm_list_2 (scm_cons (scm_from_long (old_timer.it_interval.tv_sec),
+ scm_from_long (old_timer.it_interval.tv_usec)),
+ scm_cons (scm_from_long (old_timer.it_value.tv_sec),
+ scm_from_long (old_timer.it_value.tv_usec)));
}
#undef FUNC_NAME
#endif /* HAVE_GETITIMER */
@@ -676,14 +676,14 @@ scm_init_scmsigs ()
#endif
}
- scm_c_define ("NSIG", scm_long2num (NSIG));
- scm_c_define ("SIG_IGN", scm_long2num ((long) SIG_IGN));
- scm_c_define ("SIG_DFL", scm_long2num ((long) SIG_DFL));
+ scm_c_define ("NSIG", scm_from_long (NSIG));
+ scm_c_define ("SIG_IGN", scm_from_long ((long) SIG_IGN));
+ scm_c_define ("SIG_DFL", scm_from_long ((long) SIG_DFL));
#ifdef SA_NOCLDSTOP
- scm_c_define ("SA_NOCLDSTOP", scm_long2num (SA_NOCLDSTOP));
+ scm_c_define ("SA_NOCLDSTOP", scm_from_long (SA_NOCLDSTOP));
#endif
#ifdef SA_RESTART
- scm_c_define ("SA_RESTART", scm_long2num (SA_RESTART));
+ scm_c_define ("SA_RESTART", scm_from_long (SA_RESTART));
#endif
#if defined(HAVE_SETITIMER) || defined(HAVE_GETITIMER)