summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Browning <rlb@defaultvalue.org>2003-03-25 23:53:32 +0000
committerRob Browning <rlb@defaultvalue.org>2003-03-25 23:53:32 +0000
commitec81cb0b99b434af8bb300a3e9d234f8e75813ca (patch)
treeb78fbaae623eabd59eff17d46543ac3ee589a1e2
parentcca86e031b892a407fb36afcfd0fa87c248d8051 (diff)
downloadguile-ec81cb0b99b434af8bb300a3e9d234f8e75813ca.tar.gz
* coop-defs.h: move handling of time related headers to
scmconfig.h. Add #include "libguile/__scm.h". Rename usage of HAVE_WINSOCK2_H to SCM_HAVE_WINSOCK2_H. Replace usage of struct timespect with scm_t_timespec.
-rw-r--r--libguile/coop-defs.h20
1 files changed, 4 insertions, 16 deletions
diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h
index 716f24d66..13f826d3b 100644
--- a/libguile/coop-defs.h
+++ b/libguile/coop-defs.h
@@ -46,23 +46,11 @@
-# ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-# else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# ifdef HAVE_TIME_H
-# include <time.h>
-# endif
-# endif
-# endif
-
+#include "libguile/__scm.h"
#include "libguile/iselect.h"
-#if HAVE_WINSOCK2_H
-#include <winsock2.h>
+#ifdef SCM_HAVE_WINSOCK2_H
+# include <winsock2.h>
#endif
#ifdef GUILE_PTHREAD_COMPAT
@@ -163,7 +151,7 @@ SCM_API int coop_new_condition_variable_init (coop_c*, coop_cattr*);
SCM_API int coop_condition_variable_wait_mutex (coop_c*, coop_m*);
SCM_API int coop_condition_variable_timed_wait_mutex (coop_c*,
coop_m*,
- const struct timespec *abstime);
+ const scm_t_timespec *abstime);
SCM_API int coop_condition_variable_signal (coop_c*);
SCM_API int coop_condition_variable_broadcast (coop_c*);
SCM_API int coop_condition_variable_destroy (coop_c*);