From 97cc65fee47997b4fe542507fa3e607a255d6d73 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 20 Jun 2018 16:33:05 +0200 Subject: [PATCH] Rename __scm.h to scm.h * libguile/scm.h: Rename. Update all includers. --- guile-readline/readline.h | 6 +++--- libguile.h | 2 +- libguile/Makefile.am | 1 + libguile/alist.h | 1 - libguile/array-handle.c | 1 - libguile/array-handle.h | 1 - libguile/array-map.h | 2 +- libguile/arrays.c | 1 - libguile/arrays.h | 1 - libguile/async.h | 1 - libguile/atomic.h | 1 - libguile/backtrace.h | 2 +- libguile/bitvectors.c | 1 - libguile/bitvectors.h | 1 - libguile/boolean.c | 2 +- libguile/boolean.h | 8 ++++---- libguile/bytevectors.h | 1 - libguile/cache-internal.h | 3 +-- libguile/chars.h | 1 - libguile/chooks.c | 1 - libguile/chooks.h | 2 +- libguile/continuations.h | 1 - libguile/debug-malloc.h | 2 +- libguile/debug.h | 3 +-- libguile/deprecated.h | 1 - libguile/deprecation.h | 2 +- libguile/dynl.h | 2 +- libguile/dynstack.h | 2 +- libguile/dynwind.h | 1 - libguile/eq.h | 4 ++-- libguile/error.h | 2 +- libguile/eval.c | 1 - libguile/eval.h | 2 -- libguile/evalext.h | 2 +- libguile/expand.c | 1 - libguile/expand.h | 1 - libguile/extensions.h | 2 +- libguile/fdes-finalizers.h | 4 ++-- libguile/feature.h | 2 +- libguile/filesys.h | 1 - libguile/finalizers.h | 4 ++-- libguile/fluids.h | 1 - libguile/foreign-object.h | 3 +-- libguile/foreign.h | 1 - libguile/fports.h | 1 - libguile/frames.h | 2 -- libguile/gc-inline.h | 2 -- libguile/gc.h | 1 - libguile/gen-scmconfig.c | 4 ++-- libguile/generalized-arrays.c | 1 - libguile/generalized-arrays.h | 1 - libguile/generalized-vectors.c | 1 - libguile/generalized-vectors.h | 2 +- libguile/gettext.h | 2 +- libguile/goops.h | 1 - libguile/gsubr.h | 1 - libguile/guardians.h | 2 +- libguile/hash.h | 2 +- libguile/hashtab.h | 1 - libguile/hooks.h | 1 - libguile/i18n.h | 2 +- libguile/init.h | 1 - libguile/inline.h | 2 +- libguile/instructions.h | 2 +- libguile/intrinsics.h | 2 +- libguile/ioext.h | 2 +- libguile/iselect.h | 9 ++++----- libguile/keywords.h | 1 - libguile/list.h | 2 +- libguile/load.h | 2 +- libguile/loader.h | 2 +- libguile/macros.h | 2 +- libguile/mallocs.h | 2 +- libguile/memoize.c | 1 - libguile/memoize.h | 2 +- libguile/modules.h | 2 -- libguile/net_db.h | 2 +- libguile/numbers.h | 2 -- libguile/objprop.h | 2 +- libguile/options.h | 2 +- libguile/pairs.c | 2 +- libguile/pairs.h | 6 ++---- libguile/poll.h | 2 +- libguile/ports.h | 2 -- libguile/posix-w32.c | 2 -- libguile/posix.h | 1 - libguile/print.c | 2 +- libguile/print.h | 2 -- libguile/procprop.h | 2 +- libguile/procs.h | 1 - libguile/programs.h | 1 - libguile/promises.c | 2 -- libguile/promises.h | 2 +- libguile/r6rs-ports.h | 4 ++-- libguile/random.h | 1 - libguile/rdelim.h | 2 +- libguile/read.h | 2 -- libguile/regex-posix.h | 1 - libguile/rw.h | 2 +- libguile/{__scm.h => scm.h} | 6 +++--- libguile/scmsigs.h | 1 - libguile/script.h | 2 +- libguile/simpos.h | 2 +- libguile/smob.h | 1 - libguile/snarf.h | 2 +- libguile/socket.h | 2 +- libguile/sort.h | 2 +- libguile/srcprop.h | 1 - libguile/srfi-1.h | 6 +++--- libguile/srfi-13.h | 6 +++--- libguile/srfi-14.h | 1 - libguile/srfi-4.c | 1 - libguile/srfi-4.h | 1 - libguile/srfi-60.h | 4 ++-- libguile/stackchk.h | 2 -- libguile/stacks.h | 1 - libguile/stime.h | 2 +- libguile/strings.h | 1 - libguile/strorder.h | 2 +- libguile/strports.h | 1 - libguile/struct.h | 1 - libguile/symbols.h | 1 - libguile/syntax.h | 2 +- libguile/threads.h | 1 - libguile/throw.h | 2 +- libguile/trees.h | 2 +- libguile/unicode.h | 2 +- libguile/uniform.c | 2 -- libguile/uniform.h | 1 - libguile/values.h | 2 +- libguile/variable.h | 1 - libguile/vectors.h | 1 - libguile/vm.h | 1 - libguile/vports.h | 2 +- libguile/weak-list.h | 1 - libguile/weak-set.h | 2 +- libguile/weak-table.h | 2 +- libguile/weak-vector.h | 2 +- 138 files changed, 92 insertions(+), 176 deletions(-) rename libguile/{__scm.h => scm.h} (99%) diff --git a/guile-readline/readline.h b/guile-readline/readline.h index 3c935e2aa..413b60838 100644 --- a/guile-readline/readline.h +++ b/guile-readline/readline.h @@ -1,7 +1,7 @@ #ifndef READLINEH #define READLINEH -/* Copyright (C) 1997, 1999, 2000, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2006, 2018 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,8 @@ * */ +#include + /* SCM_RL_API is a macro prepended to all function and data definitions which should be exported or imported in the resulting dynamic link library in the Win32 port. */ @@ -32,8 +34,6 @@ # define SCM_RL_API extern #endif -#include "libguile/__scm.h" - SCM_RL_API scm_t_option scm_readline_opts[]; #define SCM_HISTORY_FILE_P scm_readline_opts[0].val diff --git a/libguile.h b/libguile.h index 8fb771f9f..76b89aa8d 100644 --- a/libguile.h +++ b/libguile.h @@ -29,7 +29,7 @@ extern "C" { #endif -#include "libguile/__scm.h" +#include "libguile/scm.h" #include "libguile/alist.h" #include "libguile/array-handle.h" #include "libguile/array-map.h" diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 53e1e7f92..70f3abcb3 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -577,6 +577,7 @@ pkginclude_HEADERS = # These are headers visible as . modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/libguile modinclude_HEADERS = \ + scm.h \ __scm.h \ alist.h \ array-handle.h \ diff --git a/libguile/alist.h b/libguile/alist.h index 31caa7041..2c1b422db 100644 --- a/libguile/alist.h +++ b/libguile/alist.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include "libguile/pairs.h" diff --git a/libguile/array-handle.c b/libguile/array-handle.c index 545eb3759..b49b8e9ea 100644 --- a/libguile/array-handle.c +++ b/libguile/array-handle.c @@ -26,7 +26,6 @@ #include -#include "libguile/__scm.h" #include "libguile/bitvectors.h" #include "libguile/bytevectors.h" #include "libguile/list.h" diff --git a/libguile/array-handle.h b/libguile/array-handle.h index 1722d16fc..48dafe02b 100644 --- a/libguile/array-handle.h +++ b/libguile/array-handle.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/error.h" #include "libguile/inline.h" #include "libguile/numbers.h" diff --git a/libguile/array-map.h b/libguile/array-map.h index bc19baa09..39154b6d0 100644 --- a/libguile/array-map.h +++ b/libguile/array-map.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/arrays.c b/libguile/arrays.c index 3a57447d6..92f78068e 100644 --- a/libguile/arrays.c +++ b/libguile/arrays.c @@ -33,7 +33,6 @@ #include "libguile/gsubr.h" #include "libguile/pairs.h" #include "libguile/boolean.h" -#include "libguile/__scm.h" #include "libguile/eq.h" #include "libguile/chars.h" #include "libguile/eval.h" diff --git a/libguile/arrays.h b/libguile/arrays.h index 446bd1d50..d7e3b28fa 100644 --- a/libguile/arrays.h +++ b/libguile/arrays.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/gc.h" #include "libguile/print.h" diff --git a/libguile/async.h b/libguile/async.h index 918b0ecb9..ba9b8df1d 100644 --- a/libguile/async.h +++ b/libguile/async.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/threads.h" diff --git a/libguile/atomic.h b/libguile/atomic.h index 2d7a5cfc2..e66273700 100644 --- a/libguile/atomic.h +++ b/libguile/atomic.h @@ -21,7 +21,6 @@ -#include "libguile/__scm.h" #include "libguile/gc.h" diff --git a/libguile/backtrace.h b/libguile/backtrace.h index 8e6e4129e..2cfc2c7e8 100644 --- a/libguile/backtrace.h +++ b/libguile/backtrace.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_print_exception (SCM port, SCM frame, SCM key, SCM args); diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c index 9dbeee8a3..62f597753 100644 --- a/libguile/bitvectors.c +++ b/libguile/bitvectors.c @@ -28,7 +28,6 @@ #include "libguile/gsubr.h" #include "libguile/pairs.h" #include "libguile/boolean.h" -#include "libguile/__scm.h" #include "libguile/array-handle.h" #include "libguile/bitvectors.h" #include "libguile/generalized-vectors.h" diff --git a/libguile/bitvectors.h b/libguile/bitvectors.h index 698539aef..b790cb20a 100644 --- a/libguile/bitvectors.h +++ b/libguile/bitvectors.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/array-handle.h" diff --git a/libguile/boolean.c b/libguile/boolean.c index 4de9d4186..57486cb8d 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -38,7 +38,7 @@ * terms of the SCM_MATCHES_BITS_IN_COMMON macro. * * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in __scm.h for more information. + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information. */ verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ (SCM_BOOL_F_BITS, SCM_BOOL_T_BITS)); diff --git a/libguile/boolean.h b/libguile/boolean.h index bee0d66b2..780c761e2 100644 --- a/libguile/boolean.h +++ b/libguile/boolean.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" @@ -48,7 +48,7 @@ /* * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in __scm.h for more information on + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information on * how the following macro works. */ #define scm_is_false_or_nil(x) \ @@ -68,7 +68,7 @@ * which will be ignored by SCM_MATCHES_BITS_IN_COMMON below. * * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in __scm.h for more information. + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information. * * If SCM_ENABLE_ELISP is true, then scm_is_bool_or_nil(x) * returns 1 if and only if x is one of the following: SCM_BOOL_F, @@ -112,7 +112,7 @@ SCM_API int scm_to_bool (SCM x); * ignored by SCM_MATCHES_BITS_IN_COMMON below. * * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in __scm.h for more information. + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information. * * scm_is_lisp_false(x) returns 1 if and only if x is one of the * following: SCM_BOOL_F, SCM_ELISP_NIL, SCM_EOL or diff --git a/libguile/bytevectors.h b/libguile/bytevectors.h index cae0c46d5..97571705f 100644 --- a/libguile/bytevectors.h +++ b/libguile/bytevectors.h @@ -21,7 +21,6 @@ -#include "libguile/__scm.h" #include #include "libguile/gc.h" diff --git a/libguile/cache-internal.h b/libguile/cache-internal.h index 4c1732f81..7bb2e2c68 100644 --- a/libguile/cache-internal.h +++ b/libguile/cache-internal.h @@ -1,7 +1,7 @@ #ifndef SCM_CACHE_INTERNAL_H #define SCM_CACHE_INTERNAL_H -/* Copyright (C) 2016 +/* Copyright (C) 2016,2018 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -25,7 +25,6 @@ #include -#include "libguile/__scm.h" #include "libguile/gc.h" #include "libguile/hash.h" #include "libguile/threads.h" diff --git a/libguile/chars.h b/libguile/chars.h index 7d5a53dd1..35c9a8e8c 100644 --- a/libguile/chars.h +++ b/libguile/chars.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include diff --git a/libguile/chooks.c b/libguile/chooks.c index 458147cbe..5f6dbcf4e 100644 --- a/libguile/chooks.c +++ b/libguile/chooks.c @@ -25,7 +25,6 @@ #include -#include "libguile/__scm.h" #include "libguile/gc.h" #include "libguile/chooks.h" diff --git a/libguile/chooks.h b/libguile/chooks.h index c6d65ef1d..5cb21d8b8 100644 --- a/libguile/chooks.h +++ b/libguile/chooks.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" /* * C level hooks diff --git a/libguile/continuations.h b/libguile/continuations.h index 57b2f8005..e63e6e299 100644 --- a/libguile/continuations.h +++ b/libguile/continuations.h @@ -24,7 +24,6 @@ #include -#include "libguile/__scm.h" #include "libguile/throw.h" diff --git a/libguile/debug-malloc.h b/libguile/debug-malloc.h index 87030ca38..7b5bd6e28 100644 --- a/libguile/debug-malloc.h +++ b/libguile/debug-malloc.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/debug.h b/libguile/debug.h index 8e015ad7b..840d0db79 100644 --- a/libguile/debug.h +++ b/libguile/debug.h @@ -22,9 +22,8 @@ -#include "libguile/__scm.h" - #include "libguile/options.h" + SCM_API SCM scm_local_eval (SCM exp, SCM env); diff --git a/libguile/deprecated.h b/libguile/deprecated.h index de6e07163..40d9266c8 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -19,7 +19,6 @@ * 02110-1301 USA */ -#include "libguile/__scm.h" #include "libguile/snarf.h" #if (SCM_ENABLE_DEPRECATED == 1) diff --git a/libguile/deprecation.h b/libguile/deprecation.h index a217a7548..6404577fd 100644 --- a/libguile/deprecation.h +++ b/libguile/deprecation.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/dynl.h b/libguile/dynl.h index 235aba717..bd11f854c 100644 --- a/libguile/dynl.h +++ b/libguile/dynl.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/dynstack.h b/libguile/dynstack.h index fa01f8696..c0a733108 100644 --- a/libguile/dynstack.h +++ b/libguile/dynstack.h @@ -24,7 +24,7 @@ #include #include -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/dynwind.h b/libguile/dynwind.h index d99abf131..fb0a3bcf8 100644 --- a/libguile/dynwind.h +++ b/libguile/dynwind.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/dynstack.h" diff --git a/libguile/eq.h b/libguile/eq.h index 71c7d299a..9143da70a 100644 --- a/libguile/eq.h +++ b/libguile/eq.h @@ -22,11 +22,11 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" -/* scm_is_eq is defined in __scm.h for some reason. */ +/* scm_is_eq is defined in scm.h for some reason. */ /* An older spelling for scm_is_eq. */ #define SCM_EQ_P(x,y) (scm_is_eq (x, y)) diff --git a/libguile/error.h b/libguile/error.h index 30e906669..b8acfc476 100644 --- a/libguile/error.h +++ b/libguile/error.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_system_error_key; diff --git a/libguile/eval.c b/libguile/eval.c index c0e9ef462..f794911bb 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -26,7 +26,6 @@ #include #include -#include "libguile/__scm.h" #include "libguile/gsubr.h" #include "libguile/pairs.h" #include "libguile/boolean.h" diff --git a/libguile/eval.h b/libguile/eval.h index bec9e4b05..32adef228 100644 --- a/libguile/eval.h +++ b/libguile/eval.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/struct.h" #include "libguile/memoize.h" diff --git a/libguile/evalext.h b/libguile/evalext.h index b8d7d34d6..309d961b4 100644 --- a/libguile/evalext.h +++ b/libguile/evalext.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/expand.c b/libguile/expand.c index a923d6df2..a73d74f62 100644 --- a/libguile/expand.c +++ b/libguile/expand.c @@ -23,7 +23,6 @@ # include #endif -#include "libguile/__scm.h" #include "libguile/gsubr.h" #include "libguile/pairs.h" #include "libguile/boolean.h" diff --git a/libguile/expand.h b/libguile/expand.h index f557f6004..6b8211421 100644 --- a/libguile/expand.h +++ b/libguile/expand.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/struct.h" diff --git a/libguile/extensions.h b/libguile/extensions.h index bfe8703b9..7c4469932 100644 --- a/libguile/extensions.h +++ b/libguile/extensions.h @@ -21,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" #include "libguile/libpath.h" diff --git a/libguile/fdes-finalizers.h b/libguile/fdes-finalizers.h index cadbb0404..ceedbf051 100644 --- a/libguile/fdes-finalizers.h +++ b/libguile/fdes-finalizers.h @@ -1,7 +1,7 @@ #ifndef SCM_FDES_FINALIZERS_H #define SCM_FDES_FINALIZERS_H -/* Copyright (C) 2016 Free Software Foundation, Inc. +/* Copyright (C) 2016, 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,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/feature.h b/libguile/feature.h index ed3d9860d..2f3582618 100644 --- a/libguile/feature.h +++ b/libguile/feature.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API void scm_add_feature (const char* str); SCM_API SCM scm_program_arguments (void); diff --git a/libguile/filesys.h b/libguile/filesys.h index 1d2b1f632..5417b3de0 100644 --- a/libguile/filesys.h +++ b/libguile/filesys.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include diff --git a/libguile/finalizers.h b/libguile/finalizers.h index 27b2cbf82..cb1cf514e 100644 --- a/libguile/finalizers.h +++ b/libguile/finalizers.h @@ -1,7 +1,7 @@ #ifndef SCM_FINALIZERS_H #define SCM_FINALIZERS_H -/* Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. +/* Copyright (C) 2012, 2013, 2014, 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,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/fluids.h b/libguile/fluids.h index 2af8784bd..ebe7aee74 100644 --- a/libguile/fluids.h +++ b/libguile/fluids.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include "libguile/vectors.h" diff --git a/libguile/foreign-object.h b/libguile/foreign-object.h index 806b7eddb..a8cde3653 100644 --- a/libguile/foreign-object.h +++ b/libguile/foreign-object.h @@ -1,7 +1,7 @@ #ifndef SCM_FOREIGN_OBJECT_H #define SCM_FOREIGN_OBJECT_H -/* Copyright (C) 2014 Free Software Foundation, Inc. +/* Copyright (C) 2014, 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,7 +21,6 @@ -#include "libguile/__scm.h" #include "libguile/print.h" diff --git a/libguile/foreign.h b/libguile/foreign.h index b78f29d5b..fcfe9e265 100644 --- a/libguile/foreign.h +++ b/libguile/foreign.h @@ -19,7 +19,6 @@ * 02110-1301 USA */ -#include "libguile/__scm.h" #include "libguile/gc.h" #include "libguile/snarf.h" diff --git a/libguile/fports.h b/libguile/fports.h index b26b18a6d..53d14adf4 100644 --- a/libguile/fports.h +++ b/libguile/fports.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/gc.h" #include "libguile/ports.h" diff --git a/libguile/frames.h b/libguile/frames.h index 3aa0e2491..c20167e90 100644 --- a/libguile/frames.h +++ b/libguile/frames.h @@ -19,8 +19,6 @@ #ifndef _SCM_FRAMES_H_ #define _SCM_FRAMES_H_ -#include - #include #include "programs.h" diff --git a/libguile/gc-inline.h b/libguile/gc-inline.h index 176d9c5a9..14c1a2776 100644 --- a/libguile/gc-inline.h +++ b/libguile/gc-inline.h @@ -39,8 +39,6 @@ -#include "libguile/__scm.h" - #include "libguile/gc.h" #include "libguile/bdw-gc.h" #include "libguile/threads.h" diff --git a/libguile/gc.h b/libguile/gc.h index dc559e769..8127acbf0 100644 --- a/libguile/gc.h +++ b/libguile/gc.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/inline.h" #include "libguile/chooks.h" diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c index 4ac90f0a5..65e7f6f09 100644 --- a/libguile/gen-scmconfig.c +++ b/libguile/gen-scmconfig.c @@ -21,7 +21,7 @@ Description of Guile's public config header mechanics: ----------------------------------------------------- - Guile has four core headers: + Guile has three core headers: config.h: Guile's private automatically generated configuration header -- generated by configure.in and autoheader. *NOT* @@ -42,7 +42,7 @@ gen-scmconfig.h.in), and the information provided in this file, gen-scmconfig.c. - libguile/__scm.h: Guile's public core header. This file is + libguile/scm.h: Guile's public core header. This file is installed and publically visible. It includes libguile/scmconfig.h, the public config header and provides a place to make decisions based on the information gathered in diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c index 2e7ee318d..94d23c8b4 100644 --- a/libguile/generalized-arrays.c +++ b/libguile/generalized-arrays.c @@ -29,7 +29,6 @@ #include "libguile/gsubr.h" #include "libguile/pairs.h" -#include "libguile/__scm.h" #include "libguile/array-handle.h" #include "libguile/generalized-arrays.h" #include "libguile/list.h" diff --git a/libguile/generalized-arrays.h b/libguile/generalized-arrays.h index 060d5f811..7dc661610 100644 --- a/libguile/generalized-arrays.h +++ b/libguile/generalized-arrays.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/array-handle.h" #include "libguile/boolean.h" #include diff --git a/libguile/generalized-vectors.c b/libguile/generalized-vectors.c index a7a012329..76d6f34d3 100644 --- a/libguile/generalized-vectors.c +++ b/libguile/generalized-vectors.c @@ -26,7 +26,6 @@ #include "libguile/gsubr.h" #include "libguile/error.h" -#include "libguile/__scm.h" #include "libguile/generalized-vectors.h" diff --git a/libguile/generalized-vectors.h b/libguile/generalized-vectors.h index 133c0c9ee..77a042860 100644 --- a/libguile/generalized-vectors.h +++ b/libguile/generalized-vectors.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/snarf.h" diff --git a/libguile/gettext.h b/libguile/gettext.h index 82aa54d8c..96ba43cda 100644 --- a/libguile/gettext.h +++ b/libguile/gettext.h @@ -20,7 +20,7 @@ * 02110-1301 USA */ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_gettext (SCM msgid, SCM domainname, SCM category); SCM_API SCM scm_ngettext (SCM msgid, SCM msgid_plural, SCM n, SCM domainname, SCM category); diff --git a/libguile/goops.h b/libguile/goops.h index 599b46a39..34f4f1df7 100644 --- a/libguile/goops.h +++ b/libguile/goops.h @@ -29,7 +29,6 @@ * Erick Gallesio . */ -#include "libguile/__scm.h" #include "libguile/boolean.h" #include "libguile/list.h" #include "libguile/ports.h" diff --git a/libguile/gsubr.h b/libguile/gsubr.h index 4d7b0cf35..a11d6fede 100644 --- a/libguile/gsubr.h +++ b/libguile/gsubr.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/snarf.h" diff --git a/libguile/guardians.h b/libguile/guardians.h index 63cac2c79..ed7478ed7 100644 --- a/libguile/guardians.h +++ b/libguile/guardians.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_make_guardian (void); diff --git a/libguile/hash.h b/libguile/hash.h index a0f308dce..8f1ef7ef8 100644 --- a/libguile/hash.h +++ b/libguile/hash.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/hashtab.h b/libguile/hashtab.h index a4c1d0adf..8394f669d 100644 --- a/libguile/hashtab.h +++ b/libguile/hashtab.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/gc.h" diff --git a/libguile/hooks.h b/libguile/hooks.h index b9c977335..c33efe5e6 100644 --- a/libguile/hooks.h +++ b/libguile/hooks.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include diff --git a/libguile/i18n.h b/libguile/i18n.h index ee74bbacb..31bce3046 100644 --- a/libguile/i18n.h +++ b/libguile/i18n.h @@ -20,7 +20,7 @@ * 02110-1301 USA */ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_global_locale; SCM_API SCM scm_make_locale (SCM category_mask, SCM locale_name, SCM base_locale); diff --git a/libguile/init.h b/libguile/init.h index 39f702174..4d7972781 100644 --- a/libguile/init.h +++ b/libguile/init.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/threads.h" diff --git a/libguile/inline.h b/libguile/inline.h index 7bafb0626..79cb7b3ec 100644 --- a/libguile/inline.h +++ b/libguile/inline.h @@ -25,7 +25,7 @@ platforms that do support inline functions, the definitions are still compiled into the library, once, in inline.c. */ -#include "libguile/__scm.h" +#include "libguile/scm.h" /* Define SCM_C_INLINE_KEYWORD so that it can be used as a replacement for the "inline" keyword, expanding to nothing when "inline" is not diff --git a/libguile/instructions.h b/libguile/instructions.h index 8ffd1ffb2..8d9f16f63 100644 --- a/libguile/instructions.h +++ b/libguile/instructions.h @@ -19,7 +19,7 @@ #ifndef _SCM_INSTRUCTIONS_H_ #define _SCM_INSTRUCTIONS_H_ -#include +#include #include #ifdef BUILDING_LIBGUILE diff --git a/libguile/intrinsics.h b/libguile/intrinsics.h index 6a00c8f61..c587655b1 100644 --- a/libguile/intrinsics.h +++ b/libguile/intrinsics.h @@ -19,7 +19,7 @@ #ifndef _SCM_VM_INTRINSICS_H_ #define _SCM_VM_INTRINSICS_H_ -#include +#include #ifdef BUILDING_LIBGUILE diff --git a/libguile/ioext.h b/libguile/ioext.h index b64bc4302..59f6ac9d7 100644 --- a/libguile/ioext.h +++ b/libguile/ioext.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/iselect.h b/libguile/iselect.h index 7b9824298..eea6f0dec 100644 --- a/libguile/iselect.h +++ b/libguile/iselect.h @@ -22,13 +22,12 @@ -#include "libguile/__scm.h" - -/* Needed for FD_SET on some systems. */ -#include - +#include /* Needed for FD_SET on some systems. */ #include +#include "libguile/scm.h" + + SCM_API int scm_std_select (int fds, fd_set *rfds, fd_set *wfds, diff --git a/libguile/keywords.h b/libguile/keywords.h index a53350613..fb17b57f1 100644 --- a/libguile/keywords.h +++ b/libguile/keywords.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include diff --git a/libguile/list.h b/libguile/list.h index 57d93bb11..5a265b801 100644 --- a/libguile/list.h +++ b/libguile/list.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/error.h" diff --git a/libguile/load.h b/libguile/load.h index 5753ba68a..af749314c 100644 --- a/libguile/load.h +++ b/libguile/load.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_parse_path (SCM path, SCM tail); diff --git a/libguile/loader.h b/libguile/loader.h index 60b288152..578ff2c0a 100644 --- a/libguile/loader.h +++ b/libguile/loader.h @@ -19,7 +19,7 @@ #ifndef _SCM_LOADER_H_ #define _SCM_LOADER_H_ -#include +#include #ifdef BUILDING_LIBGUILE diff --git a/libguile/macros.h b/libguile/macros.h index 23dbc8a22..9aa81d915 100644 --- a/libguile/macros.h +++ b/libguile/macros.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/mallocs.h b/libguile/mallocs.h index 016272be4..352405191 100644 --- a/libguile/mallocs.h +++ b/libguile/mallocs.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API scm_t_bits scm_tc16_malloc; diff --git a/libguile/memoize.c b/libguile/memoize.c index cadaa2da7..7edde18ee 100644 --- a/libguile/memoize.c +++ b/libguile/memoize.c @@ -27,7 +27,6 @@ #include #include -#include "libguile/__scm.h" #include "libguile/gsubr.h" #include "libguile/pairs.h" #include "libguile/boolean.h" diff --git a/libguile/memoize.h b/libguile/memoize.h index ec6efb3f3..3280f697e 100644 --- a/libguile/memoize.h +++ b/libguile/memoize.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/modules.h b/libguile/modules.h index 66adff51b..893e4c577 100644 --- a/libguile/modules.h +++ b/libguile/modules.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/gc.h" diff --git a/libguile/net_db.h b/libguile/net_db.h index 737d9439a..466456535 100644 --- a/libguile/net_db.h +++ b/libguile/net_db.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/numbers.h b/libguile/numbers.h index 1001194e2..125b9b79f 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -24,9 +24,7 @@ #include -#include "libguile/__scm.h" #include "libguile/error.h" - #include "libguile/gc.h" #include "libguile/print.h" diff --git a/libguile/objprop.h b/libguile/objprop.h index f6aa010ff..e8a6ebe64 100644 --- a/libguile/objprop.h +++ b/libguile/objprop.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/options.h b/libguile/options.h index ccfcff40e..4fc9c4cab 100644 --- a/libguile/options.h +++ b/libguile/options.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/pairs.c b/libguile/pairs.c index 57c2099b7..648b04ae6 100644 --- a/libguile/pairs.c +++ b/libguile/pairs.c @@ -40,7 +40,7 @@ * which is defined in terms of the SCM_MATCHES_BITS_IN_COMMON macro. * * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in __scm.h for more information. + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information. */ verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ (SCM_ELISP_NIL_BITS, SCM_EOL_BITS)); diff --git a/libguile/pairs.h b/libguile/pairs.h index d4a75c09d..05e5ff792 100644 --- a/libguile/pairs.h +++ b/libguile/pairs.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/error.h" #include "libguile/gc.h" #include "libguile/inline.h" @@ -46,8 +44,8 @@ /* * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in __scm.h for more information on - * how the following macro works. + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information on how the + * following macro works. */ #define scm_is_null_or_nil(x) \ (SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_EOL)) diff --git a/libguile/poll.h b/libguile/poll.h index d1aa7ac0a..c053f45e2 100644 --- a/libguile/poll.h +++ b/libguile/poll.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/ports.h b/libguile/ports.h index f40448a39..0fc2fab7f 100644 --- a/libguile/ports.h +++ b/libguile/ports.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/gc.h" #include "libguile/error.h" #include "libguile/print.h" diff --git a/libguile/posix-w32.c b/libguile/posix-w32.c index 142b57675..6f7f019fb 100644 --- a/libguile/posix-w32.c +++ b/libguile/posix-w32.c @@ -20,8 +20,6 @@ # include #endif -#include "libguile/__scm.h" - # define WIN32_LEAN_AND_MEAN #include #include diff --git a/libguile/posix.h b/libguile/posix.h index 9be90b881..5d4765152 100644 --- a/libguile/posix.h +++ b/libguile/posix.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/threads.h" diff --git a/libguile/print.c b/libguile/print.c index 404ab2eea..41459a440 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -84,7 +84,7 @@ static void write_character (scm_t_wchar, SCM); * This table must agree with the declarations in scm.h: {Immediate Symbols}. */ -/* This table must agree with the list of flags in __scm.h. */ +/* This table must agree with the list of flags in scm.h. */ static const char *iflagnames[] = { "#f", diff --git a/libguile/print.h b/libguile/print.h index 4719baada..ea3e75001 100644 --- a/libguile/print.h +++ b/libguile/print.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/chars.h" #include #include diff --git a/libguile/procprop.h b/libguile/procprop.h index d174b772d..3782e6400 100644 --- a/libguile/procprop.h +++ b/libguile/procprop.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/procs.h b/libguile/procs.h index 9e772b328..a6c05d40a 100644 --- a/libguile/procs.h +++ b/libguile/procs.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/boolean.h" #include diff --git a/libguile/programs.h b/libguile/programs.h index 95a1eb047..1c082b472 100644 --- a/libguile/programs.h +++ b/libguile/programs.h @@ -19,7 +19,6 @@ #ifndef _SCM_PROGRAMS_H_ #define _SCM_PROGRAMS_H_ -#include #include /* diff --git a/libguile/promises.c b/libguile/promises.c index ac7876be6..c94e45469 100644 --- a/libguile/promises.c +++ b/libguile/promises.c @@ -25,9 +25,7 @@ #include -#include "libguile/__scm.h" #include "libguile/gsubr.h" - #include "libguile/alist.h" #include "libguile/async.h" #include "libguile/continuations.h" diff --git a/libguile/promises.h b/libguile/promises.h index fe179517a..d8aa8d493 100644 --- a/libguile/promises.h +++ b/libguile/promises.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/smob.h" diff --git a/libguile/r6rs-ports.h b/libguile/r6rs-ports.h index a2c63c7f4..99acd9f5c 100644 --- a/libguile/r6rs-ports.h +++ b/libguile/r6rs-ports.h @@ -1,7 +1,7 @@ #ifndef SCM_R6RS_PORTS_H #define SCM_R6RS_PORTS_H -/* Copyright (C) 2009, 2010, 2011, 2013 Free Software Foundation, Inc. +/* Copyright (C) 2009, 2010, 2011, 2013, 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,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" /* R6RS I/O Ports. */ diff --git a/libguile/random.h b/libguile/random.h index a864bb32e..d422220c6 100644 --- a/libguile/random.h +++ b/libguile/random.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include diff --git a/libguile/rdelim.h b/libguile/rdelim.h index cec8dddb0..e20e02766 100644 --- a/libguile/rdelim.h +++ b/libguile/rdelim.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_read_delimited_x (SCM delims, SCM buf, SCM gobble, SCM port, SCM offset, SCM length); diff --git a/libguile/read.h b/libguile/read.h index 3b3110078..1118a0acb 100644 --- a/libguile/read.h +++ b/libguile/read.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/options.h" diff --git a/libguile/regex-posix.h b/libguile/regex-posix.h index c2bc9230e..8078d782c 100644 --- a/libguile/regex-posix.h +++ b/libguile/regex-posix.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include SCM_API scm_t_bits scm_tc16_regex; diff --git a/libguile/rw.h b/libguile/rw.h index cbe8c7f56..153a091b0 100644 --- a/libguile/rw.h +++ b/libguile/rw.h @@ -21,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_read_string_x_partial (SCM str, SCM port_or_fdes, SCM start, SCM end); diff --git a/libguile/__scm.h b/libguile/scm.h similarity index 99% rename from libguile/__scm.h rename to libguile/scm.h index 52d251c7e..389e94702 100644 --- a/libguile/__scm.h +++ b/libguile/scm.h @@ -1,5 +1,5 @@ -#ifndef SCM___SCM_H -#define SCM___SCM_H +#ifndef SCM_SCM_H +#define SCM_SCM_H /* Copyright (C) 1995-2004,2006-2015,2017-2018 * Free Software Foundation, Inc. @@ -848,4 +848,4 @@ typedef long SCM_STACKITEM; #define SCM_STACK_PTR(ptr) ((SCM_STACKITEM *) (void *) (ptr)) -#endif /* SCM___SCM_H */ +#endif /* SCM_SCM_H */ diff --git a/libguile/scmsigs.h b/libguile/scmsigs.h index 4dbdc6118..643357fc2 100644 --- a/libguile/scmsigs.h +++ b/libguile/scmsigs.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/threads.h" diff --git a/libguile/script.h b/libguile/script.h index 6d1dc3af0..bb781b5f3 100644 --- a/libguile/script.h +++ b/libguile/script.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API char *scm_find_executable (const char *name); diff --git a/libguile/simpos.h b/libguile/simpos.h index 8ab84233c..bf0125da1 100644 --- a/libguile/simpos.h +++ b/libguile/simpos.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/smob.h b/libguile/smob.h index d14fec5a1..af0f6cb1b 100644 --- a/libguile/smob.h +++ b/libguile/smob.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include #include "libguile/inline.h" diff --git a/libguile/snarf.h b/libguile/snarf.h index f8f870b1b..b00bfc372 100644 --- a/libguile/snarf.h +++ b/libguile/snarf.h @@ -23,7 +23,7 @@ -#include +#include /* Macros for snarfing initialization actions from C source. */ diff --git a/libguile/socket.h b/libguile/socket.h index 7cfff6ec9..ae39b55dd 100644 --- a/libguile/socket.h +++ b/libguile/socket.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/sort.h b/libguile/sort.h index f9a138276..907ccc261 100644 --- a/libguile/sort.h +++ b/libguile/sort.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/srcprop.h b/libguile/srcprop.h index 124594b89..67b264dba 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/boolean.h" diff --git a/libguile/srfi-1.h b/libguile/srfi-1.h index 47607bc55..e30bb5be7 100644 --- a/libguile/srfi-1.h +++ b/libguile/srfi-1.h @@ -1,6 +1,6 @@ /* srfi-1.h --- SRFI-1 procedures for Guile - * - * Copyright (C) 2002, 2003, 2005, 2006, 2010, 2011 Free Software Foundation, Inc. + * Copyright (C) 2002-2003,2005-2006,2010-2011,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 @@ -22,7 +22,7 @@ #ifndef SCM_SRFI_1_H #define SCM_SRFI_1_H -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_INTERNAL SCM scm_srfi1_append_reverse (SCM revhead, SCM tail); SCM_INTERNAL SCM scm_srfi1_append_reverse_x (SCM revhead, SCM tail); diff --git a/libguile/srfi-13.h b/libguile/srfi-13.h index 325e22272..643fa6d32 100644 --- a/libguile/srfi-13.h +++ b/libguile/srfi-13.h @@ -2,8 +2,8 @@ #define SCM_SRFI_13_H /* srfi-13.c --- SRFI-13 procedures for Guile - * - * Copyright (C) 2001, 2004, 2006, 2008, 2010 Free Software Foundation, Inc. + * Copyright (C) 2001,2004,2006,2008,2010,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 @@ -22,7 +22,7 @@ */ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_API SCM scm_string_null_p (SCM s); SCM_API SCM scm_string_any (SCM pred, SCM s, SCM start, SCM end); diff --git a/libguile/srfi-14.h b/libguile/srfi-14.h index f3754c565..3cc1ff64e 100644 --- a/libguile/srfi-14.h +++ b/libguile/srfi-14.h @@ -23,7 +23,6 @@ */ -#include "libguile/__scm.h" #include "libguile/chars.h" typedef struct diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c index 9bcdf5458..ce81b86f9 100644 --- a/libguile/srfi-4.c +++ b/libguile/srfi-4.c @@ -26,7 +26,6 @@ #include "libguile/gsubr.h" #include "libguile/boolean.h" -#include "libguile/__scm.h" #include "libguile/bdw-gc.h" #include "libguile/srfi-4.h" #include "libguile/bytevectors.h" diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h index 9af5f3e03..c917c9023 100644 --- a/libguile/srfi-4.h +++ b/libguile/srfi-4.h @@ -21,7 +21,6 @@ */ -#include "libguile/__scm.h" #include "libguile/array-handle.h" SCM_API SCM scm_make_srfi_4_vector (SCM type, SCM len, SCM fill); diff --git a/libguile/srfi-60.h b/libguile/srfi-60.h index 013820fca..bada9ceb6 100644 --- a/libguile/srfi-60.h +++ b/libguile/srfi-60.h @@ -1,6 +1,6 @@ /* srfi-60.h --- SRFI-60 procedures for Guile * - * Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc. + * Copyright (C) 2005, 2006, 2010, 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 @@ -22,7 +22,7 @@ #ifndef SCM_SRFI_60_H #define SCM_SRFI_60_H -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_INTERNAL SCM scm_srfi60_log2_binary_factors (SCM n); SCM_INTERNAL SCM scm_srfi60_copy_bit (SCM index, SCM n, SCM bit); diff --git a/libguile/stackchk.h b/libguile/stackchk.h index a9b2f1c38..8a3dd5523 100644 --- a/libguile/stackchk.h +++ b/libguile/stackchk.h @@ -22,8 +22,6 @@ -#include "libguile/__scm.h" - #include "libguile/continuations.h" #include "libguile/debug.h" diff --git a/libguile/stacks.h b/libguile/stacks.h index 79f950e3e..d9c3a7250 100644 --- a/libguile/stacks.h +++ b/libguile/stacks.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include "libguile/frames.h" diff --git a/libguile/stime.h b/libguile/stime.h index 34cbb13fd..13c2a0669 100644 --- a/libguile/stime.h +++ b/libguile/stime.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/strings.h b/libguile/strings.h index 7cf877677..557df963d 100644 --- a/libguile/strings.h +++ b/libguile/strings.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include #include "libguile/inline.h" diff --git a/libguile/strorder.h b/libguile/strorder.h index 0626fbeb7..76a8ca593 100644 --- a/libguile/strorder.h +++ b/libguile/strorder.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/strports.h b/libguile/strports.h index 58983a211..27fea5ed0 100644 --- a/libguile/strports.h +++ b/libguile/strports.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include #include diff --git a/libguile/struct.h b/libguile/struct.h index d39c90c8a..37d7e0174 100644 --- a/libguile/struct.h +++ b/libguile/struct.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/boolean.h" #include #include diff --git a/libguile/symbols.h b/libguile/symbols.h index d6e5f9616..7917f5356 100644 --- a/libguile/symbols.h +++ b/libguile/symbols.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include #include diff --git a/libguile/syntax.h b/libguile/syntax.h index 50bb47514..5d832d4f0 100644 --- a/libguile/syntax.h +++ b/libguile/syntax.h @@ -19,7 +19,7 @@ * 02110-1301 USA */ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_INTERNAL SCM scm_syntax_p (SCM obj); SCM_INTERNAL SCM scm_make_syntax (SCM exp, SCM wrap, SCM module); diff --git a/libguile/threads.h b/libguile/threads.h index fb8f3dbf3..2afb9e792 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -24,7 +24,6 @@ #include -#include "libguile/__scm.h" #include "libguile/procs.h" #include "libguile/throw.h" #include "libguile/dynstack.h" diff --git a/libguile/throw.h b/libguile/throw.h index 451309f09..a3c4728e1 100644 --- a/libguile/throw.h +++ b/libguile/throw.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/trees.h b/libguile/trees.h index e7aab3329..be35101dc 100644 --- a/libguile/trees.h +++ b/libguile/trees.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/unicode.h b/libguile/unicode.h index 1e376c522..9b1ee715c 100644 --- a/libguile/unicode.h +++ b/libguile/unicode.h @@ -21,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" SCM_INTERNAL SCM scm_formal_name_to_char (SCM); SCM_INTERNAL SCM scm_char_to_formal_name (SCM); diff --git a/libguile/uniform.c b/libguile/uniform.c index 16bba3591..2110d6aa1 100644 --- a/libguile/uniform.c +++ b/libguile/uniform.c @@ -23,8 +23,6 @@ # include #endif -#include "libguile/__scm.h" - #include "libguile/uniform.h" diff --git a/libguile/uniform.h b/libguile/uniform.h index 4017e7372..412993566 100644 --- a/libguile/uniform.h +++ b/libguile/uniform.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/array-handle.h" diff --git a/libguile/values.h b/libguile/values.h index c3cf249ae..7f143ad98 100644 --- a/libguile/values.h +++ b/libguile/values.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/struct.h" SCM_API SCM scm_values_vtable; diff --git a/libguile/variable.h b/libguile/variable.h index 236eeaead..ef5092f94 100644 --- a/libguile/variable.h +++ b/libguile/variable.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include #include #include diff --git a/libguile/vectors.h b/libguile/vectors.h index 9e84616cc..a9ba84051 100644 --- a/libguile/vectors.h +++ b/libguile/vectors.h @@ -22,7 +22,6 @@ -#include "libguile/__scm.h" #include "libguile/array-handle.h" #include #include "libguile/gc.h" diff --git a/libguile/vm.h b/libguile/vm.h index 6d05ca8ef..1cd0a3830 100644 --- a/libguile/vm.h +++ b/libguile/vm.h @@ -19,7 +19,6 @@ #ifndef _SCM_VM_H_ #define _SCM_VM_H_ -#include #include #include #include diff --git a/libguile/vports.h b/libguile/vports.h index e6415938e..8e8e16f35 100644 --- a/libguile/vports.h +++ b/libguile/vports.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/weak-list.h b/libguile/weak-list.h index c6be669f4..b15ea4b2e 100644 --- a/libguile/weak-list.h +++ b/libguile/weak-list.h @@ -21,7 +21,6 @@ -#include "libguile/__scm.h" #include "libguile/pairs.h" #include "libguile/weak-vector.h" diff --git a/libguile/weak-set.h b/libguile/weak-set.h index 7c687cc82..410168377 100644 --- a/libguile/weak-set.h +++ b/libguile/weak-set.h @@ -21,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/weak-table.h b/libguile/weak-table.h index b9e1f9bfc..634ee781e 100644 --- a/libguile/weak-table.h +++ b/libguile/weak-table.h @@ -21,7 +21,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" diff --git a/libguile/weak-vector.h b/libguile/weak-vector.h index 06f373ef4..5ed41c0fa 100644 --- a/libguile/weak-vector.h +++ b/libguile/weak-vector.h @@ -22,7 +22,7 @@ -#include "libguile/__scm.h" +#include "libguile/scm.h" /* Weak vectors. */