diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:32:46 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:32:46 +0100 |
commit | f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (patch) | |
tree | be17320f40e9cfd935238883dee59667cf4bf5bc /libguile/_scm.h | |
parent | 63385df2fdc2f9bc70804383f071f2fb74743a86 (diff) | |
parent | fe11efeebaa2ebb7bf0fe8bc46a29c152ead2509 (diff) | |
download | guile-f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/gc-mark.c
libguile/procs.c
libguile/procs.h
libguile/threads.c
libguile/threads.h
Diffstat (limited to 'libguile/_scm.h')
-rw-r--r-- | libguile/_scm.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libguile/_scm.h b/libguile/_scm.h index 6b728be2b..e40f29bb0 100644 --- a/libguile/_scm.h +++ b/libguile/_scm.h @@ -38,6 +38,25 @@ # include <config.h> #endif +/* Undefine HAVE_STRUCT_TIMESPEC, because the libguile C code doesn't + need it anymore, and because on MinGW: + + - the definition of struct timespec is provided (if at all) by + pthread.h + + - pthread.h will _not_ define struct timespec if + HAVE_STRUCT_TIMESPEC is 1, because then it thinks that it doesn't + need to. + + The libguile C code doesn't need HAVE_STRUCT_TIMESPEC anymore, + because the value of HAVE_STRUCT_TIMESPEC has already been + incorporated in how scm_t_timespec is defined (in scmconfig.h), and + the rest of the libguile C code now just uses scm_t_timespec. + */ +#ifdef HAVE_STRUCT_TIMESPEC +#undef HAVE_STRUCT_TIMESPEC +#endif + #include <errno.h> #include "libguile/__scm.h" |