Update copyright.

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

diff --git a/libguile/threads.c b/libguile/threads.c
index 697df00..c8a0994 100644 (file)
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -39,8 +39,6 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 
 \f
 
@@ -52,7 +50,6 @@
        threads.h
          coop-defs.h
            iselect.h
-       mit-pthreads.c
        coop-threads.c
          coop-threads.h
            coop-defs.h*
@@ -63,7 +60,6 @@
     * second #inclusion
 */
 
-#include <stdio.h>
 #include "libguile/_scm.h"
 #include "libguile/dynwind.h"
 #include "libguile/smob.h"
@@ -72,11 +68,9 @@
 
 \f
 
-long scm_tc16_thread;
-
-long scm_tc16_mutex;
-
-long scm_tc16_condvar;
+scm_t_bits scm_tc16_thread;
+scm_t_bits scm_tc16_mutex;
+scm_t_bits scm_tc16_condvar;
 
 \f
 /* Scheme-visible thread functions. */
@@ -134,10 +128,6 @@ 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 "libguile/coop-threads.c"
 #endif
@@ -151,7 +141,9 @@ scm_init_threads (SCM_STACKITEM *i)
   scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m));
   scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c));
                                         
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/threads.x"
+#endif
   /* Initialize implementation specific details of the threads support */
   scm_threads_init (i);
 }