[Guile-commits] 30/86: Devolve procs.h include from _scm.h.

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 27df59415e19eccbbc93f5cef56cd2544ff952f5
Author: Andy Wingo <address@hidden>
Date:   Tue Jun 19 09:36:25 2018 +0200

    Devolve procs.h include from _scm.h.
    
    * libguile/_scm.h: Remove procs.h include.
    * libguile/arrays.c:
    * libguile/foreign-object.c:
    * libguile/ports.c:
    * libguile/promises.c:
    * libguile/r6rs-ports.c:
    * libguile/scmsigs.c:
    * libguile/srfi-1.c:
    * libguile/srfi-13.c:
    * libguile/srfi-14.c:
    * libguile/strports.c:
    * libguile/weak-table.c: Add procs includes.
---
 libguile/_scm.h           | 1 -
 libguile/arrays.c         | 1 +
 libguile/foreign-object.c | 1 +
 libguile/ports.c          | 1 +
 libguile/promises.c       | 1 +
 libguile/r6rs-ports.c     | 4 +++-
 libguile/scmsigs.c        | 1 +
 libguile/srfi-1.c         | 1 +
 libguile/srfi-13.c        | 1 +
 libguile/srfi-14.c        | 1 +
 libguile/strports.c       | 1 +
 libguile/weak-table.c     | 1 +
 12 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libguile/_scm.h b/libguile/_scm.h
index dd1ac5e..755a9ba 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -36,7 +36,6 @@
 
 /* Include headers for those files central to the implementation.  The
    rest should be explicitly #included in the C files themselves.  */
-#include "libguile/procs.h"    /* Same.  */
 #include "libguile/numbers.h"  /* Everyone deals with fixnums.  */
 #include "libguile/symbols.h"  /* For length, chars, values, miscellany.  */
 #include "libguile/threads.h"  /* You are not alone. */
diff --git a/libguile/arrays.c b/libguile/arrays.c
index 025567e..ed2fb6e 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -44,6 +44,7 @@
 #include "libguile/srfi-4.h"
 #include "libguile/vectors.h"
 #include "libguile/bitvectors.h"
+#include "libguile/procs.h"
 #include "libguile/bytevectors.h"
 #include "libguile/list.h"
 #include "libguile/dynwind.h"
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index 58f050a..f410cb9 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -29,6 +29,7 @@
 #include "libguile/foreign-object.h"
 #include "libguile/goops.h"
 #include "libguile/list.h"
+#include "libguile/procs.h"
 
 
 
diff --git a/libguile/ports.c b/libguile/ports.c
index bf1e742..d95af7e 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -59,6 +59,7 @@
 #include "libguile/ports.h"
 #include "libguile/ports-internal.h"
 #include "libguile/private-options.h"
+#include "libguile/procs.h"
 #include "libguile/syscalls.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-set.h"
diff --git a/libguile/promises.c b/libguile/promises.c
index 1aa0f63..20274b2 100644
--- a/libguile/promises.c
+++ b/libguile/promises.c
@@ -48,6 +48,7 @@
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/procprop.h"
+#include "libguile/procs.h"
 #include "libguile/programs.h"
 #include "libguile/smob.h"
 #include "libguile/srcprop.h"
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index cbe6a8d..64c0e7d 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2009, 2010, 2011, 2013-2015, 2018 Free Software Foundation, 
Inc.
+/* Copyright (C) 2009-2011,2013-2015,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
@@ -31,6 +32,7 @@
 #include "libguile/chars.h"
 #include "libguile/eval.h"
 #include "libguile/extensions.h"
+#include "libguile/procs.h"
 #include "libguile/r6rs-ports.h"
 #include "libguile/strings.h"
 #include "libguile/smob.h"
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index a0926dc..c46aa98 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -50,6 +50,7 @@
 #include "libguile/feature.h"
 #include "libguile/eval.h"
 #include "libguile/list.h"
+#include "libguile/procs.h"
 #include "libguile/vectors.h"
 #include "libguile/syscalls.h"
 #include "libguile/threads.h"
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index c202603..fc56c41 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -31,6 +31,7 @@
 
 #include "libguile/list.h"
 #include "libguile/eval.h"
+#include "libguile/procs.h"
 #include "libguile/srfi-1.h"
 #include "libguile/values.h"
 #include "libguile/extensions.h"
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index ef50c81..9101976 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -35,6 +35,7 @@
 #include "libguile/error.h"
 #include "libguile/hash.h"
 #include "libguile/list.h"
+#include "libguile/procs.h"
 #include "libguile/srfi-13.h"
 #include "libguile/srfi-14.h"
 
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index 26cd7c2..953b43e 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -33,6 +33,7 @@
 #include "libguile/chars.h"
 #include "libguile/eval.h"
 #include "libguile/list.h"
+#include "libguile/procs.h"
 #include "libguile/srfi-14.h"
 #include "libguile/strings.h"
 #include "libguile/values.h"
diff --git a/libguile/strports.c b/libguile/strports.c
index 0389175..06f7654 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -33,6 +33,7 @@
 #include "libguile/eval.h"
 #include "libguile/keywords.h"
 #include "libguile/ports.h"
+#include "libguile/procs.h"
 #include "libguile/read.h"
 #include "libguile/strings.h"
 #include "libguile/syscalls.h"
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index f2ddf08..24a4cad 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -34,6 +34,7 @@
 #include "libguile/hash.h"
 #include "libguile/eval.h"
 #include "libguile/ports.h"
+#include "libguile/procs.h"
 #include "libguile/weak-list.h"
 #include "libguile/weak-table.h"