From 83584ef23105be514c474ca0a1f107d681888d5d Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 14 Jun 2018 22:16:01 +0200 Subject: Fix libguile subcomponent headers not to include * 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 instead of . 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. --- libguile/expand.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libguile/expand.c') diff --git a/libguile/expand.c b/libguile/expand.c index fc7da54a8..c1f557ce5 100644 --- a/libguile/expand.c +++ b/libguile/expand.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014 +/* Copyright (C) 1995-1996,1997-2014,2018 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -25,15 +25,18 @@ #include "libguile/__scm.h" #include "libguile/_scm.h" +#include "libguile/alist.h" #include "libguile/continuations.h" #include "libguile/eq.h" +#include "libguile/expand.h" +#include "libguile/hashtab.h" +#include "libguile/keywords.h" #include "libguile/list.h" #include "libguile/macros.h" -#include "libguile/expand.h" #include "libguile/modules.h" -#include "libguile/srcprop.h" #include "libguile/ports.h" #include "libguile/print.h" +#include "libguile/srcprop.h" #include "libguile/strings.h" #include "libguile/throw.h" #include "libguile/validate.h" -- cgit v1.2.3