*** empty log message ***

[bpt/guile.git] / libguile / threads.c

diff --git a/libguile/threads.c b/libguile/threads.c
index 0bb2551..5685a89 100644 (file)
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/*     Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +52,6 @@
        threads.h
          coop-defs.h
            iselect.h
-       mit-pthreads.c
        coop-threads.c
          coop-threads.h
            coop-defs.h*
@@ -64,12 +63,11 @@
 */
 
 #include <stdio.h>
-#include "_scm.h"
-#include "dynwind.h"
-#include "smob.h"
-#include "genio.h"
+#include "libguile/_scm.h"
+#include "libguile/dynwind.h"
+#include "libguile/smob.h"
 
-#include "threads.h"
+#include "libguile/threads.h"
 
 \f
 
@@ -135,30 +133,26 @@ SCM_REGISTER_PROC(s_signal_condition_variable, "signal-condition-variable", 1, 0
 
 \f
 
-#ifdef USE_MIT_PTHREADS
-#include "mit-pthreads.c"
-#endif
-
 #ifdef USE_COOP_THREADS
-#include "coop-threads.c"
+#include "libguile/coop-threads.c"
 #endif
 
 \f
 
-#ifdef __STDC__
 void
 scm_init_threads (SCM_STACKITEM *i)
-#else
-void
-scm_init_threads (i)
-     SCM_STACKITEM *i;
-#endif
 {
-  scm_tc16_thread = scm_make_smob_type ("thread", sizeof (coop_t));
+  scm_tc16_thread = scm_make_smob_type ("thread", 0);
   scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m));
   scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c));
                                         
-#include "threads.x"
+#include "libguile/threads.x"
   /* Initialize implementation specific details of the threads support */
   scm_threads_init (i);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/