From f0ffc6acaffa16d7106a219205526156a73ad456 Mon Sep 17 00:00:00 2001 From: mainzelm Date: Mon, 1 Jan 2001 16:45:32 +0000 Subject: [PATCH] port to new FFI --- scsh/bsd/time_dep1.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/scsh/bsd/time_dep1.c b/scsh/bsd/time_dep1.c index 8e799e0..77fbbfc 100644 --- a/scsh/bsd/time_dep1.c +++ b/scsh/bsd/time_dep1.c @@ -12,27 +12,13 @@ #include "scheme48.h" #include "../time1.h" -/* Sux because it's dependent on 32-bitness. */ -#define hi8(i) (((i)>>24) & 0xff) -#define lo24(i) ((i) & 0xffffff) -#define comp8_24(hi, lo) (((hi)<<24) + (lo)) - -s48_value time_plus_ticks(int *hi_secs, int *lo_secs, - int *hi_ticks, int *lo_ticks) +s48_value time_plus_ticks() { struct timeval t; struct timezone tz; - if( gettimeofday(&t, &tz) ) return s48_enter_fixnum(errno); + if( gettimeofday(&t, &tz) ) s48_raise_os_error (errno); - { long int secs = t.tv_sec; - long int ticks = t.tv_usec; - - *hi_secs = hi8(secs); - *lo_secs = lo24(secs); - *hi_ticks = hi8(ticks); - *lo_ticks = lo24(ticks); - } - - return S48_FALSE; - } + return s48_cons (s48_enter_integer (t.tv_sec), + s48_cons (s48_enter_integer (t.tv_usec), S48_NULL)); +}