mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-22 20:40:29 +02:00
Code Activity

* eq.c (scm_equal_p): use "SCM_TYP7SD", not "SCM (TYP7SD".

Browse source 
* stime.c: include both <sys/times.h> and <sys/timeb.h> if the
system has them.  Hope this is safe.  Previously
sys/timeb.h was included if HAVE_FTIME was defined or if
HAVE_SYS_TIMEB_H was defined but HAVE_SYS_TIMES_H was not,
but IRIX iris 5.3 apparently has ftime but not sys/timeb.h.
This commit is contained in:
Gary Houston 1997-04-21 08:14:48 +00:00
parent 4fa5885b5c
commit b1978258f0
3 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/ChangeLog
View file

@ -1,5 +1,13 @@
Mon Apr 21 05:00:32 1997 Gary Houston <ghouston@actrix.gen.nz> Mon Apr 21 05:00:32 1997 Gary Houston <ghouston@actrix.gen.nz>
* eq.c (scm_equal_p): use "SCM_TYP7SD", not "SCM (TYP7SD".
* stime.c: include both <sys/times.h> and <sys/timeb.h> if the
system has them. Hope this is safe. Previously
sys/timeb.h was included if HAVE_FTIME was defined or if
HAVE_SYS_TIMEB_H was defined but HAVE_SYS_TIMES_H was not,
but IRIX iris 5.3 apparently has ftime but not sys/timeb.h.
* ioext.c (scm_setfileno): add missing third argument to * ioext.c (scm_setfileno): add missing third argument to
scm_misc_error call. scm_misc_error call.

2
libguile/eq.c
View file

@ -107,7 +107,7 @@ scm_equal_p (x, y)
goto tailrecurse; goto tailrecurse;
} }
if (SCM_TYP7SD (x) == scm_tc7_string if (SCM_TYP7SD (x) == scm_tc7_string
&& SCM (TYP7SD (x) == scm_tc7_string)) && SCM_TYP7SD (x) == scm_tc7_string)
return scm_string_equal_p (x, y); return scm_string_equal_p (x, y);
/* This ensures that types and scm_length are the same. */ /* This ensures that types and scm_length are the same. */
if (SCM_CAR(x) != SCM_CAR(y)) return SCM_BOOL_F; if (SCM_CAR(x) != SCM_CAR(y)) return SCM_BOOL_F;

10
libguile/stime.c
View file

@ -71,11 +71,11 @@
#ifdef HAVE_SYS_TIMES_H #ifdef HAVE_SYS_TIMES_H
# include <sys/times.h> # include <sys/times.h>
# else #endif
#ifdef HAVE_SYS_TIMEB_H #ifdef HAVE_SYS_TIMEB_H
# include <sys/timeb.h> # include <sys/timeb.h>
#endif #endif
# endif
#ifndef tzname /* For SGI. */ #ifndef tzname /* For SGI. */
extern char *tzname[]; /* RS6000 and others reject char **tzname. */ extern char *tzname[]; /* RS6000 and others reject char **tzname. */
@ -105,12 +105,6 @@ char *strptime ();
# endif # endif
#endif #endif
# ifdef HAVE_FTIME
# include <sys/timeb.h>
# endif
#ifdef __STDC__ #ifdef __STDC__
# define timet time_t # define timet time_t
#else #else