Only include ports.h where it is actually needed.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index bbb5ac0..216bba8 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-17  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * _scm.h:  Don't include ports.h everywhere...
+
+       * arbiters.c backtrace.c debug.c dynl.c dynwind.c eval.c feature.c
+       fluids.c gc.c gdbint.c guardians.c hash.c keywords.c mallocs.c
+       numbers.c objects.c print.c read.c root.c smob.c srcprop.c
+       stackchk.c strports.c struct.c throw.c variable.c:  ... only
+       include it here.
+
 2000-03-17  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * _scm.h:  Don't include vectors.h everywhere...

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 34b7a72..96a8d86 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -72,7 +72,6 @@
 #include "boolean.h"           /* Everyone wonders about the truth.  */
 #include "strings.h"           /* Everyone loves string.  */
 #include "root.h"              /* Everyone uses these objects.  */
-#include "ports.h"             /* Everyone does I/O.  */
 #include "async.h"             /* Everyone allows/disallows ints.  */
 #ifdef USE_THREADS
 #include "threads.h"           /* The cooperative thread package does

diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index 6327de1..7decd48 100644 (file)
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -46,6 +46,7 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "ports.h"
 #include "smob.h"
 
 #include "validate.h"

diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index a07d9c2..b76acf3 100644 (file)
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -62,6 +62,7 @@
 #include "strports.h"
 #include "throw.h"
 #include "fluids.h"
+#include "ports.h"
 
 #include "validate.h"
 #include "backtrace.h"

diff --git a/libguile/debug.c b/libguile/debug.c
index 1755ad0..ad32953 100644 (file)
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -63,6 +63,7 @@
 #include "feature.h"
 #include "dynwind.h"
 #include "modules.h"
+#include "ports.h"
 
 #include "validate.h"
 #include "debug.h"

diff --git a/libguile/dynl.c b/libguile/dynl.c
index 4eda621..efefd58 100644 (file)
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -69,6 +69,7 @@ maybe_drag_in_eprintf ()
 #include "dynl.h"
 #include "smob.h"
 #include "keywords.h"
+#include "ports.h"
 
 #include "validate.h"
 

diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 0601492..3816a98 100644 (file)
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -49,6 +49,7 @@
 #include "eval.h"
 #include "alist.h"
 #include "fluids.h"
+#include "ports.h"
 #include "smob.h"
 
 #include "dynwind.h"

diff --git a/libguile/eval.c b/libguile/eval.c
index 8e13f06..72cffef 100644 (file)
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -95,6 +95,7 @@ char *alloca ();
 #include "objects.h"
 #include "feature.h"
 #include "modules.h"
+#include "ports.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/feature.c b/libguile/feature.c
index e04eb4d..94c1299 100644 (file)
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -48,6 +48,7 @@
 #include "_scm.h"
 
 #include "eval.h"
+#include "ports.h"
 #include "procprop.h"
 #include "smob.h"
 

diff --git a/libguile/fluids.c b/libguile/fluids.c
index e757b57..fa3d926 100644 (file)
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -50,6 +50,7 @@
 #include "fluids.h"
 #include "alist.h"
 #include "eval.h"
+#include "ports.h"
 
 #define INITIAL_FLUIDS 10
 #include "validate.h"

diff --git a/libguile/gc.c b/libguile/gc.c
index 6a21eac..daad90e 100644 (file)
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -53,6 +53,7 @@
 #include "smob.h"
 #include "unif.h"
 #include "async.h"
+#include "ports.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/gdbint.c b/libguile/gdbint.c
index 6e0b294..2771a9f 100644 (file)
--- a/libguile/gdbint.c
+++ b/libguile/gdbint.c
@@ -60,6 +60,7 @@
 #include "eval.h"
 #include "chars.h"
 #include "modules.h"
+#include "ports.h"
 
 #include "gdbint.h"
 \f

diff --git a/libguile/guardians.c b/libguile/guardians.c
index 80d2aa4..4cc92c2 100644 (file)
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -58,6 +58,7 @@
 #include <assert.h>
 
 #include "_scm.h"
+#include "ports.h"
 #include "print.h"
 #include "smob.h"
 #include "vectors.h"

diff --git a/libguile/hash.c b/libguile/hash.c
index e88523f..aee3144 100644 (file)
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "chars.h"
+#include "ports.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/keywords.c b/libguile/keywords.c
index c0b126d..b1b5318 100644 (file)
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -46,6 +46,7 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "ports.h"
 #include "smob.h"
 #include "vectors.h"
 

diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 393e7db..8cf331a 100644 (file)
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "ports.h"
 #include "smob.h"
 
 #include "mallocs.h"

diff --git a/libguile/numbers.c b/libguile/numbers.c
index a7a1d67..b93176f 100644 (file)
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -49,6 +49,7 @@
 #include "_scm.h"
 #include "unif.h"
 #include "feature.h"
+#include "ports.h"
 #include "smob.h"
 #include "vectors.h"
 

diff --git a/libguile/objects.c b/libguile/objects.c
index 3cb7aea..37e6497 100644 (file)
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -58,6 +58,7 @@
 #include "smob.h"
 #include "eval.h"
 #include "alist.h"
+#include "ports.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/print.c b/libguile/print.c
index 6158397..3e638d9 100644 (file)
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -57,6 +57,7 @@
 #include "alist.h"
 #include "struct.h"
 #include "objects.h"
+#include "ports.h"
 #include "strports.h"
 #include "vectors.h"
 

diff --git a/libguile/read.c b/libguile/read.c
index 20fc903..339c36b 100644 (file)
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -54,6 +54,7 @@
 #include "srcprop.h"
 #include "hashtab.h"
 #include "hash.h"
+#include "ports.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/root.c b/libguile/root.c
index 6a4b35c..8b4ed1d 100644 (file)
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -53,6 +53,7 @@
 #include "pairs.h"
 #include "throw.h"
 #include "fluids.h"
+#include "ports.h"
 
 #include "root.h"
 \f

diff --git a/libguile/smob.c b/libguile/smob.c
index f4947a0..bb4f99b 100644 (file)
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -48,6 +48,7 @@
 #include "_scm.h"
 
 #include "objects.h"
+#include "ports.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index bb3232a..c0845b3 100644 (file)
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -54,6 +54,7 @@
 #include "debug.h"
 #include "hashtab.h"
 #include "hash.h"
+#include "ports.h"
 #include "weaks.h"
 
 #include "validate.h"

diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index aece69e..fffdc64 100644 (file)
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -46,6 +46,7 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "ports.h"
 
 #include "stackchk.h"
 \f

diff --git a/libguile/strports.c b/libguile/strports.c
index 503164c..4888f1f 100644 (file)
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -53,6 +53,7 @@
 
 #include "unif.h"
 #include "eval.h"
+#include "ports.h"
 #include "read.h"
 #include "vectors.h"
 

diff --git a/libguile/struct.c b/libguile/struct.c
index c81c6e8..45afc3b 100644 (file)
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -51,6 +51,7 @@
 #include "alist.h"
 #include "weaks.h"
 #include "hashtab.h"
+#include "ports.h"
 
 #include "validate.h"
 #include "struct.h"

diff --git a/libguile/throw.c b/libguile/throw.c
index 05274ca..8d303cf 100644 (file)
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -59,6 +59,7 @@
 #include "stackchk.h"
 #include "stacks.h"
 #include "fluids.h"
+#include "ports.h"
 
 #include "validate.h"
 #include "throw.h"

diff --git a/libguile/variable.c b/libguile/variable.c
index a1f19c2..25da2fd 100644 (file)
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "eq.h"
+#include "ports.h"
 #include "smob.h"
 
 #include "validate.h"