Merge branch 'boehm-demers-weiser-gc' into bdw-gc-static-alloc

Conflicts:
	.gitignore
	libguile/procs.h

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"
 

libguile/inline.h

@@ -54,7 +54,7 @@
    C99 mode and doesn't define `__GNUC_STDC_INLINE__'.  Fall back to "static
    inline" in that case.  */
 
-# if (defined __GNUC__) && (!(__APPLE_CC__ > 5400 && __STDC_VERSION__ >= 199901L))
+# if (defined __GNUC__) && (!(((defined __APPLE_CC__) && (__APPLE_CC__ > 5400)) && __STDC_VERSION__ >= 199901L))
 #  define SCM_C_USE_EXTERN_INLINE 1
 #  if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2)
 #   define SCM_C_EXTERN_INLINE					\

libguile/threads.h

@@ -210,7 +210,7 @@ SCM_API int scm_pthread_cond_wait (pthread_cond_t *cond,
 				   pthread_mutex_t *mutex);
 SCM_API int scm_pthread_cond_timedwait (pthread_cond_t *cond,
 					pthread_mutex_t *mutex,
-					const struct timespec *abstime);
+					const scm_t_timespec *abstime);
 #endif
 
 /* More convenience functions.