summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2000-05-30 15:56:55 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2000-05-30 15:56:55 +0000
commitb272843227b9d84c21e16129371a2d4a6a2e62f5 (patch)
treef3e4561c4384c6294c482aefed0b95a7c09ef581
parentaa4bb95d6a9074276daba4917f8241846afb7954 (diff)
downloadguile-b272843227b9d84c21e16129371a2d4a6a2e62f5.tar.gz
* Removed mit-threads and fsu-threads and references.
-rw-r--r--ChangeLog5
-rw-r--r--acconfig.h9
-rw-r--r--libguile/ChangeLog9
-rw-r--r--libguile/Makefile.am4
-rw-r--r--libguile/coop-threads.c.cygnus0
-rw-r--r--libguile/coop-threads.h.cygnus0
-rw-r--r--libguile/fsu-pthreads.h0
-rw-r--r--libguile/mit-pthreads.c0
-rw-r--r--libguile/mit-pthreads.h0
-rw-r--r--libguile/scmsigs.c7
-rw-r--r--libguile/threads.c5
-rw-r--r--libguile/threads.h27
12 files changed, 24 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index 373bcf75a..1e92603f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-30 Dirk Herrmann <D.Herrmann@tu-bs.de>
+
+ * acconfig.h (USE_FSU_PTHREADS, USE_MIT_PTHREADS,
+ USE_PCTHREADS_PTHREADS): Removed.
+
2000-05-01 Gary Houston <ghouston@arglist.com>
* Makefile.am: add include_HEADERS.
diff --git a/acconfig.h b/acconfig.h
index 1262bc2ec..5f20c10d8 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -98,15 +98,6 @@
/* Define if using cooperative multithreading. */
#undef USE_COOP_THREADS
-/* Define if using "FSU" pthreads. */
-#undef USE_FSU_PTHREADS
-
-/* Define if using MIT pthreads. */
-#undef USE_MIT_PTHREADS
-
-/* Define if using PCthreads pthreads. */
-#undef USE_PCTHREADS_PTHREADS
-
/* Define if using any sort of threads. */
#undef USE_THREADS
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index a78a9e875..effe2a600 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-30 Dirk Herrmann <D.Herrmann@tu-bs.de>
+
+ * coop-threads.c.cygnus, coop-threads.h.cygnus, fsu-pthreads.h,
+ mit-pthreads.c, mit-pthreads.h: Deleted.
+
+ * Makefile.am (EXTRA_DIST), scmsigs.c, threads.[ch]: Drop
+ references to deleted files and fsu/mit thread support in
+ general.
+
2000-05-29 Dirk Herrmann <D.Herrmann@tu-bs.de>
* hooks.c (symbol_name, scm_create_hook): Restored the original
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 66fc92563..9205dbe2f 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -123,9 +123,7 @@ check-local:
echo '(+ 1 2 3)' | GUILE_LOAD_PATH=${top_srcdir}:.. ./gh_test_repl; echo
EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads cpp_signal.c \
- cpp_errno.c cpp_err_symbols.in cpp_sig_symbols.in cpp_cnvt.awk \
- coop-threads.h.cygnus coop-threads.c.cygnus mit-pthreads.h \
- mit-pthreads.c fsu-pthreads.h
+ cpp_errno.c cpp_err_symbols.in cpp_sig_symbols.in cpp_cnvt.awk
## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/libguile/coop-threads.c.cygnus b/libguile/coop-threads.c.cygnus
deleted file mode 100644
index e69de29bb..000000000
--- a/libguile/coop-threads.c.cygnus
+++ /dev/null
diff --git a/libguile/coop-threads.h.cygnus b/libguile/coop-threads.h.cygnus
deleted file mode 100644
index e69de29bb..000000000
--- a/libguile/coop-threads.h.cygnus
+++ /dev/null
diff --git a/libguile/fsu-pthreads.h b/libguile/fsu-pthreads.h
deleted file mode 100644
index e69de29bb..000000000
--- a/libguile/fsu-pthreads.h
+++ /dev/null
diff --git a/libguile/mit-pthreads.c b/libguile/mit-pthreads.c
deleted file mode 100644
index e69de29bb..000000000
--- a/libguile/mit-pthreads.c
+++ /dev/null
diff --git a/libguile/mit-pthreads.h b/libguile/mit-pthreads.h
deleted file mode 100644
index e69de29bb..000000000
--- a/libguile/mit-pthreads.h
+++ /dev/null
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 48394052a..22a6e8966 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -74,13 +74,6 @@ int usleep ();
-#ifdef USE_MIT_PTHREADS
-#undef signal
-#define signal pthread_signal
-#endif
-
-
-
/* SIGRETTYPE is the type that signal handlers return. See <signal.h> */
#ifdef RETSIGTYPE
diff --git a/libguile/threads.c b/libguile/threads.c
index 697df005e..5685a8907 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -52,7 +52,6 @@
threads.h
coop-defs.h
iselect.h
- mit-pthreads.c
coop-threads.c
coop-threads.h
coop-defs.h*
@@ -134,10 +133,6 @@ SCM_REGISTER_PROC(s_signal_condition_variable, "signal-condition-variable", 1, 0
-#ifdef USE_MIT_PTHREADS
-#include "mit-pthreads.c"
-#endif
-
#ifdef USE_COOP_THREADS
#include "libguile/coop-threads.c"
#endif
diff --git a/libguile/threads.h b/libguile/threads.h
index f210d9562..8fba1775a 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -3,7 +3,7 @@
#ifndef THREADSH
#define THREADSH
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 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,19 +52,21 @@
#include "libguile/procs.h"
#include "libguile/throw.h"
+
+
/* smob tags for the thread datatypes */
extern long scm_tc16_thread;
extern long scm_tc16_mutex;
extern long scm_tc16_condvar;
-#define SCM_THREADP(obj) (SCM_NIMP(obj) && (scm_tc16_thread == SCM_TYP16 (obj)))
-#define SCM_THREAD_DATA(obj) ((void *) SCM_CDR (obj))
+#define SCM_THREADP(x) (!SCM_IMP (x) && (SCM_TYP16 (x) == scm_tc16_thread))
+#define SCM_THREAD_DATA(x) ((void *) SCM_CELL_WORD_1 (x))
-#define SCM_MUTEXP(obj) (SCM_NIMP(obj) && (scm_tc16_mutex == SCM_TYP16 (obj)))
-#define SCM_MUTEX_DATA(obj) ((void *) SCM_CDR (obj))
+#define SCM_MUTEXP(x) (!SCM_IMP (x) && (SCM_TYP16 (x) == scm_tc16_mutex))
+#define SCM_MUTEX_DATA(x) ((void *) SCM_CELL_WORD_1 (x))
-#define SCM_CONDVARP(obj) (SCM_NIMP(obj) && (scm_tc16_condvar == SCM_TYP16 (obj)))
-#define SCM_CONDVAR_DATA(obj) ((void *) SCM_CDR (obj))
+#define SCM_CONDVARP(x) (!SCM_IMP (x) && (SCM_TYP16 (x) == scm_tc16_condvar))
+#define SCM_CONDVAR_DATA(x) ((void *) SCM_CELL_WORD_1 (x))
/* Initialize implementation specific details of the threads support */
void scm_threads_init (SCM_STACKITEM *);
@@ -100,17 +102,6 @@ extern SCM scm_make_condition_variable (void);
extern SCM scm_wait_condition_variable (SCM cond, SCM mutex);
extern SCM scm_signal_condition_variable (SCM cond);
-#if 0
-/* These don't work any more. */
-#ifdef USE_MIT_PTHREADS
-#include "mit-pthreads.h"
-#endif
-
-#ifdef USE_FSU_PTHREADS
-#include "fsu-pthreads.h"
-#endif
-#endif
-
#ifdef USE_COOP_THREADS
#include "libguile/coop-defs.h"
#endif