diff options
| author | Andy Wingo <wingo@pobox.com> | 2018-06-14 22:16:01 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2018-06-14 22:20:47 +0200 |
| commit | 83584ef23105be514c474ca0a1f107d681888d5d (patch) | |
| tree | 52b924cabc24d4216123c40baa2ccd26f4ad089d /libguile/expand.c | |
| parent | ceaf782770b597f4eb31a4fca65a75ab220aa47c (diff) | |
| download | guile-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/expand.c')
| -rw-r--r-- | libguile/expand.c | 9 |
1 files changed, 6 insertions, 3 deletions
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" |