[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 59/86: Devolve threads.h from _scm.h.
From: |
Andy Wingo |
Subject: |
[Guile-commits] 59/86: Devolve threads.h from _scm.h. |
Date: |
Wed, 20 Jun 2018 14:09:40 -0400 (EDT) |
wingo pushed a commit to branch master
in repository guile.
commit 1ddf42dae0e6b5aa2ca5c0fb058cb32eb28d053b
Author: Andy Wingo <address@hidden>
Date: Wed Jun 20 11:52:29 2018 +0200
Devolve threads.h from _scm.h.
* libguile/__scm.h (scm_print_state, scm_t_dynstack): Add forward
declarations.
* libguile/_scm.h: Remove threads.h.
* libguile/atomic.c:
* libguile/bitvectors.h:
* libguile/bytevectors.c:
* libguile/continuations.h:
* libguile/control.c:
* libguile/deprecation.c:
* libguile/dynl.c:
* libguile/dynstack.h:
* libguile/dynwind.c:
* libguile/extensions.c:
* libguile/fdes-finalizers.c:
* libguile/foreign-object.c:
* libguile/frames.c:
* libguile/guardians.c:
* libguile/hashtab.c:
* libguile/list.c:
* libguile/loader.c:
* libguile/macros.c:
* libguile/memoize.c:
* libguile/net_db.c:
* libguile/pairs.c:
* libguile/procprop.c:
* libguile/rdelim.c:
* libguile/simpos.c:
* libguile/srfi-14.c:
* libguile/srfi-60.c:
* libguile/strings.c:
* libguile/strports.c:
* libguile/syntax.c:
* libguile/syntax.h:
* libguile/unicode.c:
* libguile/variable.c:
* libguile/vectors.c:
* libguile/weak-set.c:
* libguile/weak-set.h:
* libguile/weak-table.c:
* libguile/weak-table.h:
* libguile/weak-vector.c: Add threads.h as appropriate, or possible
other headers that threads.h pulled in.
---
libguile/__scm.h | 2 ++
libguile/_scm.h | 1 -
libguile/atomic.c | 1 +
libguile/bitvectors.h | 3 ++-
libguile/bytevectors.c | 1 +
libguile/continuations.h | 1 +
libguile/control.c | 2 ++
libguile/deprecation.c | 1 +
libguile/dynl.c | 1 +
libguile/dynstack.h | 3 ++-
libguile/dynwind.c | 1 +
libguile/extensions.c | 1 +
libguile/fdes-finalizers.c | 1 +
libguile/foreign-object.c | 1 +
libguile/frames.c | 1 +
libguile/guardians.c | 1 +
libguile/hashtab.c | 1 +
libguile/list.c | 1 +
libguile/loader.c | 1 +
libguile/macros.c | 1 +
libguile/memoize.c | 2 ++
libguile/net_db.c | 1 +
libguile/pairs.c | 1 +
libguile/procprop.c | 1 +
libguile/rdelim.c | 1 +
libguile/simpos.c | 1 +
libguile/srfi-14.c | 1 +
libguile/srfi-60.c | 1 +
libguile/strings.c | 1 +
libguile/strports.c | 1 +
libguile/syntax.c | 1 +
libguile/syntax.h | 2 +-
libguile/unicode.c | 1 +
libguile/variable.c | 1 +
libguile/vectors.c | 1 +
libguile/weak-set.c | 1 +
libguile/weak-set.h | 2 +-
libguile/weak-table.c | 1 +
libguile/weak-table.h | 2 +-
libguile/weak-vector.c | 1 +
40 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/libguile/__scm.h b/libguile/__scm.h
index 6861a81..fe99ee6 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -426,6 +426,8 @@ typedef long SCM_STACKITEM;
/* Trivial type declarations and forward declarations. */
+typedef struct scm_print_state scm_print_state;
+typedef struct scm_dynstack scm_t_dynstack;
typedef scm_t_int32 scm_t_wchar;
diff --git a/libguile/_scm.h b/libguile/_scm.h
index d7b0b93..7ce8750 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -37,7 +37,6 @@
/* Include headers for those files central to the implementation. The
rest should be explicitly #included in the C files themselves. */
#include "libguile/symbols.h" /* For length, chars, values, miscellany. */
-#include "libguile/threads.h" /* You are not alone. */
#include "libguile/foreign.h" /* Snarfing needs the foreign data structures.
*/
#include "libguile/programs.h" /* ... and program.h. */
#include "libguile/modules.h"
diff --git a/libguile/atomic.c b/libguile/atomic.c
index a82cd82..f6cc33f 100644
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@@ -23,6 +23,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/extensions.h"
#include "libguile/ports.h"
diff --git a/libguile/bitvectors.h b/libguile/bitvectors.h
index 57ae52f..d15b615 100644
--- a/libguile/bitvectors.h
+++ b/libguile/bitvectors.h
@@ -3,7 +3,8 @@
#ifndef SCM_BITVECTORS_H
#define SCM_BITVECTORS_H
-/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009, 2014
Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,1999-2001,2004,2006,2008-2009,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 7669077..f50ca82 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -37,6 +37,7 @@
#include <gmp.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/dynwind.h"
#include "libguile/extensions.h"
diff --git a/libguile/continuations.h b/libguile/continuations.h
index e8be755..edebcf2 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -27,6 +27,7 @@
#include <setjmp.h>
#include "libguile/__scm.h"
+#include "libguile/throw.h"
diff --git a/libguile/control.c b/libguile/control.c
index fb8f49a..336a812 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -23,12 +23,14 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/dynstack.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/control.h"
#include "libguile/extensions.h"
#include "libguile/list.h"
#include "libguile/programs.h"
+#include "libguile/threads.h"
#include "libguile/instructions.h"
#include "libguile/vm.h"
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index 6fba31f..14e5518 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -35,6 +35,7 @@
#include "libguile/list.h"
#include "libguile/strings.h"
#include "libguile/ports.h"
+#include "libguile/threads.h"
#include "libguile/private-options.h"
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 413f2e3..050450f 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -62,6 +62,7 @@ maybe_drag_in_eprintf ()
#include "libguile/deprecation.h"
#include "libguile/dynwind.h"
#include "libguile/foreign.h"
+#include "libguile/threads.h"
#include "libguile/gc.h"
#include <ltdl.h>
diff --git a/libguile/dynstack.h b/libguile/dynstack.h
index 66a9907..e44fdf7 100644
--- a/libguile/dynstack.h
+++ b/libguile/dynstack.h
@@ -23,13 +23,14 @@
+#include <setjmp.h>
#include <signal.h>
#include "libguile/__scm.h"
-typedef struct
+typedef struct scm_dynstack
{
scm_t_bits *base;
scm_t_bits *top;
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index aa7a835..b6efe22 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -30,6 +30,7 @@
#include "libguile/boolean.h"
#include "libguile/dynstack.h"
#include "libguile/eval.h"
+#include "libguile/threads.h"
#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/variable.h"
diff --git a/libguile/extensions.c b/libguile/extensions.c
index be73c8c..d4f0de1 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -32,6 +32,7 @@
#include "libguile/extensions.h"
#include "libguile/gc.h"
#include "libguile/strings.h"
+#include "libguile/threads.h"
typedef struct extension_t
{
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 3143299..9c50566 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -30,6 +30,7 @@
#include "libguile/hashtab.h"
#include "libguile/list.h"
#include "libguile/numbers.h"
+#include "libguile/threads.h"
#include "libguile/fdes-finalizers.h"
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index 593069d..145b6e3 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -32,6 +32,7 @@
#include "libguile/list.h"
#include "libguile/numbers.h"
#include "libguile/procs.h"
+#include "libguile/threads.h"
#include "libguile/variable.h"
diff --git a/libguile/frames.c b/libguile/frames.c
index fbd937a..b37887b 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -30,6 +30,7 @@
#include "numbers.h"
#include "frames.h"
#include "ports.h"
+#include "threads.h"
#include "libguile/variable.h"
#include "vm.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 7edb396..135a442 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -64,6 +64,7 @@
#include "libguile/ports.h"
#include "libguile/print.h"
#include "libguile/smob.h"
+#include "libguile/threads.h"
#include "libguile/weak-vector.h"
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index f25543f..c41bf1a 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -40,6 +40,7 @@
#include "libguile/list.h"
#include "libguile/numbers.h"
#include "libguile/ports.h"
+#include "libguile/procs.h"
#include "libguile/vectors.h"
#include "libguile/weak-table.h"
diff --git a/libguile/list.c b/libguile/list.c
index 08b8b51..9e3935d 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -28,6 +28,7 @@
#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/numbers.h"
+#include "libguile/procs.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/loader.c b/libguile/loader.c
index e7c4f98..13bfcee 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -48,6 +48,7 @@
#include "extensions.h"
#include "pairs.h"
#include "programs.h"
+#include "threads.h"
#include "loader.h"
/* This file contains the loader for Guile's on-disk format: ELF with
diff --git a/libguile/macros.c b/libguile/macros.c
index 0015ecf..f9ad72d 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -27,6 +27,7 @@
#include "libguile/boolean.h"
#include "libguile/ports.h"
#include "libguile/print.h"
+#include "libguile/procs.h"
#include "libguile/random.h"
#include "libguile/smob.h"
#include "libguile/macros.h"
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 4d396c6..3df26f3 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -34,6 +34,7 @@
#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/continuations.h"
+#include "libguile/dynstack.h"
#include "libguile/eq.h"
#include "libguile/expand.h"
#include "libguile/list.h"
@@ -46,6 +47,7 @@
#include "libguile/print.h"
#include "libguile/strings.h"
#include "libguile/throw.h"
+#include "libguile/threads.h"
#include "libguile/variable.h"
#include "libguile/vectors.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 75d530d..6edb4fa 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -55,6 +55,7 @@
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/dynwind.h"
+#include "libguile/throw.h"
#include "libguile/net_db.h"
#include "libguile/socket.h"
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 6b51135..84ac83d 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 01a635c..1333493 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -34,6 +34,7 @@
#include "libguile/gsubr.h"
#include "libguile/numbers.h"
#include "libguile/smob.h"
+#include "libguile/threads.h"
#include "libguile/vectors.h"
#include "libguile/weak-table.h"
#include "libguile/programs.h"
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 53990f4..578fb80 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -21,6 +21,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/simpos.c b/libguile/simpos.c
index 6163cc5..06c4655 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -28,6 +28,7 @@
#include <unistd.h> /* for _exit */
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/numbers.h"
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index 243da3e..b69dfee 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -38,6 +38,7 @@
#include "libguile/ports.h"
#include "libguile/numbers.h"
#include "libguile/procs.h"
+#include "libguile/smob.h"
#include "libguile/srfi-14.h"
#include "libguile/strings.h"
#include "libguile/values.h"
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 74c819f..8613d0b 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -25,6 +25,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/eq.h"
diff --git a/libguile/strings.c b/libguile/strings.c
index 3159ae3..c046522 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -46,6 +46,7 @@
#include "libguile/error.h"
#include "libguile/generalized-vectors.h"
#include "libguile/deprecation.h"
+#include "libguile/threads.h"
#include "libguile/private-options.h"
diff --git a/libguile/strports.c b/libguile/strports.c
index e4bd2fc..62af502 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -41,6 +41,7 @@
#include "libguile/modules.h"
#include "libguile/deprecation.h"
#include "libguile/srfi-4.h"
+#include "libguile/threads.h"
#include "libguile/variable.h"
#include "libguile/strports.h"
diff --git a/libguile/syntax.c b/libguile/syntax.c
index 70686d1..34d8f79 100644
--- a/libguile/syntax.c
+++ b/libguile/syntax.c
@@ -28,6 +28,7 @@
#include "libguile/eval.h"
#include "libguile/ports.h"
#include "libguile/syntax.h"
+#include "libguile/threads.h"
#include "libguile/variable.h"
diff --git a/libguile/syntax.h b/libguile/syntax.h
index 7fdfd28..50bb475 100644
--- a/libguile/syntax.h
+++ b/libguile/syntax.h
@@ -1,7 +1,7 @@
#ifndef SCM_SYNTAX_H
#define SCM_SYNTAX_H
-/* Copyright (C) 2017 Free Software Foundation, Inc.
+/* Copyright (C) 2017-2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/unicode.c b/libguile/unicode.c
index 2494f88..5f80b10 100644
--- a/libguile/unicode.c
+++ b/libguile/unicode.c
@@ -28,6 +28,7 @@
#include <uniname.h>
#include "libguile/_scm.h"
+#include "libguile/chars.h"
#include "libguile/gsubr.h"
#include "libguile/extensions.h"
diff --git a/libguile/variable.c b/libguile/variable.c
index 8d3bdc7..923dfc7 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index d23706a..57c1890 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/eq.h"
diff --git a/libguile/weak-set.c b/libguile/weak-set.c
index 1206dfd..6f409af 100644
--- a/libguile/weak-set.c
+++ b/libguile/weak-set.c
@@ -31,6 +31,7 @@
#include "libguile/hash.h"
#include "libguile/eval.h"
#include "libguile/ports.h"
+#include "libguile/threads.h"
#include "libguile/bdw-gc.h"
#include "libguile/weak-list.h"
diff --git a/libguile/weak-set.h b/libguile/weak-set.h
index 86781c7..6352c9b 100644
--- a/libguile/weak-set.h
+++ b/libguile/weak-set.h
@@ -3,7 +3,7 @@
#ifndef SCM_WEAK_SET_H
#define SCM_WEAK_SET_H
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011,2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index cf3727a..3b1e9ae 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -37,6 +37,7 @@
#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/procs.h"
+#include "libguile/threads.h"
#include "libguile/weak-list.h"
#include "libguile/weak-table.h"
diff --git a/libguile/weak-table.h b/libguile/weak-table.h
index f516c26..1fe5954 100644
--- a/libguile/weak-table.h
+++ b/libguile/weak-table.h
@@ -3,7 +3,7 @@
#ifndef SCM_WEAK_TABLE_H
#define SCM_WEAK_TABLE_H
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012,2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index 3032dae..deb474a 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -27,6 +27,7 @@
#include <string.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/extensions.h"
#include "libguile/list.h"
- [Guile-commits] 68/86: Remove unneeded memmove.c and strerror.c files, (continued)
- [Guile-commits] 68/86: Remove unneeded memmove.c and strerror.c files, Andy Wingo, 2018/06/20
- [Guile-commits] 64/86: Devolve strings.h, Andy Wingo, 2018/06/20
- [Guile-commits] 72/86: Fix missing includes in tests., Andy Wingo, 2018/06/20
- [Guile-commits] 60/86: Remove modules.h from _scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 75/86: Move SCM_TICK definition to __scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 74/86: Remove crufty support for 16-bit architectures., Andy Wingo, 2018/06/20
- [Guile-commits] 73/86: Deprecate pre-stdint.h limit macros, Andy Wingo, 2018/06/20
- [Guile-commits] 80/86: Rationalize guile-readline includes, Andy Wingo, 2018/06/20
- [Guile-commits] 61/86: Devolve symbols.h from _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 76/86: Move SCM_ARG1, etc definitions to error.h, Andy Wingo, 2018/06/20
- [Guile-commits] 59/86: Devolve threads.h from _scm.h.,
Andy Wingo <=
- [Guile-commits] 44/86: Devolve numbers.h from _scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 71/86: Use stdint.h limit macros, Andy Wingo, 2018/06/20
- [Guile-commits] 77/86: Minor __scm.h reformatting, Andy Wingo, 2018/06/20
- [Guile-commits] 85/86: libguile header files have uniform format for copyright declarations, Andy Wingo, 2018/06/20
- [Guile-commits] 47/86: Move subr snarfing macros to gsubr.h., Andy Wingo, 2018/06/20
- [Guile-commits] 83/86: Make .c copyright headers uniform, Andy Wingo, 2018/06/20
- [Guile-commits] 65/86: Remove _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 66/86: Remove useless "classes: h_files" from Guile headers., Andy Wingo, 2018/06/20
- [Guile-commits] 79/86: Rename __scm.h to scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 78/86: Inline tags.h into __scm.h, Andy Wingo, 2018/06/20