summaryrefslogtreecommitdiff
path: root/libguile/fports.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-14 22:16:01 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-14 22:20:47 +0200
commit83584ef23105be514c474ca0a1f107d681888d5d (patch)
tree52b924cabc24d4216123c40baa2ccd26f4ad089d /libguile/fports.c
parentceaf782770b597f4eb31a4fca65a75ab220aa47c (diff)
downloadguile-83584ef23105be514c474ca0a1f107d681888d5d.tar.gz
Fix libguile subcomponent headers not to include <libguile.h>
* libguile/bytevectors.h: Include uniform.h, for use in the macros. * libguile/extensions.h: Include libpath.h, for the SCM_EFFECTIVE_VERSION, which is almost always used with these routines. * libguile/frames.h: * libguile/instructions.h: * libguile/intrinsics.h: * libguile/loader.h: * libguile/programs.h: * libguile/vm.h: Include <libguile/__scm.h> instead of <libguile.h>. Cuts a circular include, but also precipitates a lot of maintenance in the .c files. * libguile/*.c: Update C files to add needed all needed includes that before were getting automatically pulled in by the indirect inclusion of libguile.h.
Diffstat (limited to 'libguile/fports.c')
-rw-r--r--libguile/fports.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/libguile/fports.c b/libguile/fports.c
index ee6ac0bf1..3f976d411 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -1,6 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- * 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
- * 2014, 2015, 2017 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2004, 2006-2015, 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
@@ -49,16 +47,21 @@
#include <full-write.h>
#include "libguile/_scm.h"
+#include "libguile/async.h"
+#include "libguile/dynwind.h"
+#include "libguile/extensions.h"
#include "libguile/fdes-finalizers.h"
-#include "libguile/strings.h"
-#include "libguile/validate.h"
+#include "libguile/fluids.h"
+#include "libguile/filesys.h"
+#include "libguile/fports.h"
#include "libguile/gc.h"
-#include "libguile/posix.h"
-#include "libguile/dynwind.h"
#include "libguile/hashtab.h"
-
-#include "libguile/fports.h"
+#include "libguile/keywords.h"
#include "libguile/ports-internal.h"
+#include "libguile/posix.h"
+#include "libguile/read.h"
+#include "libguile/strings.h"
+#include "libguile/validate.h"
#if SIZEOF_OFF_T == SIZEOF_INT
#define OFF_T_MAX INT_MAX