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/bytevectors.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/bytevectors.c')
| -rw-r--r-- | libguile/bytevectors.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c index 7cd753009..2f49d4c04 100644 --- a/libguile/bytevectors.c +++ b/libguile/bytevectors.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2015 Free Software Foundation, Inc. +/* Copyright (C) 2009-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 @@ -21,14 +21,25 @@ # include <config.h> #endif +#ifdef HAVE_LIMITS_H +# include <limits.h> +#endif + +#include <byteswap.h> +#include <striconveh.h> +#include <uniconv.h> +#include <unistr.h> +#include <string.h> #include <alloca.h> #include <assert.h> #include <gmp.h> #include "libguile/_scm.h" +#include "libguile/dynwind.h" #include "libguile/extensions.h" #include "libguile/bytevectors.h" +#include "libguile/generalized-vectors.h" #include "libguile/strings.h" #include "libguile/validate.h" #include "libguile/arrays.h" @@ -36,18 +47,6 @@ #include "libguile/uniform.h" #include "libguile/srfi-4.h" -#include <byteswap.h> -#include <striconveh.h> -#include <uniconv.h> -#include <unistr.h> - -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif - -#include <string.h> - - /* Utilities. */ |