Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: libguile/expand.c libguile/hashtab.c libguile/ports.c libguile/vectors.c libguile/weaks.c module/language/ecmascript/compile-tree-il.scm module/language/tree-il/effects.scm module/language/tree-il/fix-letrec.scm module/language/tree-il/peval.scm test-suite/tests/peval.test
This commit is contained in:
commit
2aed2667fc
43 changed files with 699 additions and 241 deletions
|
|
@ -149,18 +149,17 @@ main (int argc, char *argv[])
|
|||
pf ("/* limits.h not available */\n");
|
||||
#endif
|
||||
|
||||
# ifdef TIME_WITH_SYS_TIME
|
||||
#if HAVE_SYS_TIME_H
|
||||
pf ("#include <sys/time.h>\n");
|
||||
#else
|
||||
pf ("/* sys/time.h not available */\n");
|
||||
#endif
|
||||
|
||||
#if HAVE_TIME_H
|
||||
pf ("#include <time.h>\n");
|
||||
# else
|
||||
# ifdef HAVE_SYS_TIME_H
|
||||
pf ("#include <sys/time.h>\n");
|
||||
# else
|
||||
# ifdef HAVE_TIME_H
|
||||
pf ("#include <time.h>\n");
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
#else
|
||||
pf ("/* time.h not available */\n");
|
||||
#endif
|
||||
|
||||
pf("\n");
|
||||
#ifdef STDC_HEADERS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue