diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-07-06 16:52:54 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-07-06 16:52:54 +0200 |
| commit | 2aed2667fce5ccb115667a36ffd368c4c3b6e9f4 (patch) | |
| tree | 21c31f62bca976076b851d01104327152035e8d4 /libguile/gen-scmconfig.c | |
| parent | b8bc86bce147cf280ca2a60d36c8b6493cbf11e8 (diff) | |
| parent | 24dd9f6fe1449fa4de81d95ca659283c15e16931 (diff) | |
| download | guile-2aed2667fce5ccb115667a36ffd368c4c3b6e9f4.tar.gz | |
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
Diffstat (limited to 'libguile/gen-scmconfig.c')
| -rw-r--r-- | libguile/gen-scmconfig.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c index 422f826c3..e1cc0305e 100644 --- a/libguile/gen-scmconfig.c +++ b/libguile/gen-scmconfig.c @@ -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 |