|
From: Martin R. <ru...@us...> - 2004-08-05 22:21:06
|
Update of /cvsroot/foo/foo/elkfoo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3455 Modified Files: misc.c Log Message: integrated MacOSX hack: ftime() -> gettimeofday() Index: misc.c =================================================================== RCS file: /cvsroot/foo/foo/elkfoo/src/misc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** misc.c 5 Aug 2004 08:55:09 -0000 1.2 --- misc.c 5 Aug 2004 22:20:57 -0000 1.3 *************** *** 76,88 **** } static Object P_Time() { ! struct timeb t; ! extern int ftime(); ! ! ftime(&t); ! return Make_Reduced_Flonum((double)t.time + t.millitm / 1000.); } static Object P_Getpid() { --- 76,90 ---- } + static Object P_Time() { ! struct timeval t; ! struct timezone tz; ! ! gettimeofday(&t, &tz); ! return Make_Reduced_Flonum((double)t.tv_sec + t.tv_usec / 1000000.); } + static Object P_Getpid() { *************** *** 90,93 **** --- 92,96 ---- } + static Object P_System (cmd) Object cmd; { register char *s; *************** *** 126,129 **** --- 129,133 ---- } + static Object P_Getenv (e) Object e; { register char *s; *************** *** 136,139 **** --- 140,144 ---- } + static Object P_Getwd () { char buffer[PATH_MAX + 1]; *************** *** 144,147 **** --- 149,153 ---- } + static Object P_Num_Sprintf (form, num) Object form; Object num; { char buffer[1024]; *************** *** 168,178 **** } void elk_init_misc() { ! Define_Primitive(P_Time, "time", 0, 0, EVAL); ! Define_Primitive(P_Getpid, "getpid", 0, 0, EVAL); ! Define_Primitive(P_System, "system", 1, 1, EVAL); ! Define_Primitive(P_Getenv, "getenv", 1, 1, EVAL); ! Define_Primitive(P_Getwd, "getwd", 0, 0, EVAL); ! Define_Primitive(P_Num_Sprintf, "foo:num-sprintf", 2, 2, EVAL); } --- 174,186 ---- } + void elk_init_misc() { ! /* "seconds" was formerly known as "time" */ ! Define_Primitive(P_Time, "seconds", 0, 0, EVAL); ! Define_Primitive(P_Getpid, "getpid", 0, 0, EVAL); ! Define_Primitive(P_System, "system", 1, 1, EVAL); ! Define_Primitive(P_Getenv, "getenv", 1, 1, EVAL); ! Define_Primitive(P_Getwd, "getwd", 0, 0, EVAL); ! Define_Primitive(P_Num_Sprintf, "foo:num-sprintf", 2, 2, EVAL); } |