From ab878b0f8e675a741a7dd56f52638a7cc0419907 Mon Sep 17 00:00:00 2001
From: Neil Jerram <neil@ossau.uklinux.net>
Date: Fri, 23 Jan 2009 01:26:16 +0000
Subject: [PATCH] Fix build when scm_t_timespec is different from struct
 timespec

Reported by Roland Haeder.  The declaration and definition of
scm_pthread_cond_timedwait were using possibly different types for the
third arg.

* THANKS: Added Roland Haeder.

* libguile/threads.h (scm_pthread_cond_timedwait): Use scm_t_timespec
  for third arg rather than struct timespec, for consistency with the
  function implementation.
---
 NEWS               | 1 +
 THANKS             | 1 +
 libguile/threads.h | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9a160301c..cb71150e0 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,7 @@ Changes in 1.8.7 (since 1.8.6)
 
 ** Fix %fast-slot-ref/set!, to avoid possible segmentation fault
 ** Fix MinGW build problem caused by HAVE_STRUCT_TIMESPEC confusion
+** Fix build problem when scm_t_timespec is different from struct timespec
 
 
 Changes in 1.8.6 (since 1.8.5)
diff --git a/THANKS b/THANKS
index 48bdd0e2f..a0fbb8ea2 100644
--- a/THANKS
+++ b/THANKS
@@ -43,6 +43,7 @@ For fixes or providing information which led to a fix:
            John Goerzen
            Mike Gran
          Szavai Gyula
+         Roland Haeder
 	   Sven Hartrumpf
 	   Eric Hanchrow
             Sam Hocevar
diff --git a/libguile/threads.h b/libguile/threads.h
index 66ddb6aba..e2abf2648 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -232,7 +232,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.