1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00

Rename __scm.h to scm.h

* libguile/scm.h: Rename.  Update all includers.
This commit is contained in:
Andy Wingo 2018-06-20 16:33:05 +02:00
parent d9eafa374c
commit 97cc65fee4
138 changed files with 92 additions and 176 deletions

View file

@ -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 <libguile.h>
/* 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

View file

@ -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"

View file

@ -577,6 +577,7 @@ pkginclude_HEADERS =
# These are headers visible as <libguile/mumble.h>.
modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/libguile
modinclude_HEADERS = \
scm.h \
__scm.h \
alist.h \
array-handle.h \

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
#include "libguile/pairs.h"

View file

@ -26,7 +26,6 @@
#include <string.h>
#include "libguile/__scm.h"
#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
#include "libguile/list.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/error.h"
#include "libguile/inline.h"
#include "libguile/numbers.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -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"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/print.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/threads.h"

View file

@ -21,7 +21,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"

View file

@ -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);

View file

@ -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"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/array-handle.h"

View file

@ -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));

View file

@ -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

View file

@ -21,7 +21,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
#include "libguile/gc.h"

View file

@ -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 <string.h>
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/hash.h"
#include "libguile/threads.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>

View file

@ -25,7 +25,6 @@
#include <stdio.h>
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/chooks.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"
/*
* C level hooks

View file

@ -24,7 +24,6 @@
#include <setjmp.h>
#include "libguile/__scm.h"
#include "libguile/throw.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,9 +22,8 @@
#include "libguile/__scm.h"
#include "libguile/options.h"
SCM_API SCM scm_local_eval (SCM exp, SCM env);

View file

@ -19,7 +19,6 @@
* 02110-1301 USA
*/
#include "libguile/__scm.h"
#include "libguile/snarf.h"
#if (SCM_ENABLE_DEPRECATED == 1)

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -24,7 +24,7 @@
#include <setjmp.h>
#include <signal.h>
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/dynstack.h"

View file

@ -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))

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"
SCM_API SCM scm_system_error_key;

View file

@ -26,7 +26,6 @@
#include <alloca.h>
#include <stdarg.h>
#include "libguile/__scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"

View file

@ -22,8 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/struct.h"
#include "libguile/memoize.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -23,7 +23,6 @@
# include <config.h>
#endif
#include "libguile/__scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/struct.h"

View file

@ -21,7 +21,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"
#include "libguile/libpath.h"

View file

@ -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"

View file

@ -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);

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>

View file

@ -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"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
#include "libguile/vectors.h"

View file

@ -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"

View file

@ -19,7 +19,6 @@
* 02110-1301 USA
*/
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/snarf.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/ports.h"

View file

@ -19,8 +19,6 @@
#ifndef _SCM_FRAMES_H_
#define _SCM_FRAMES_H_
#include <libguile/__scm.h>
#include <libguile/gc.h>
#include "programs.h"

View file

@ -39,8 +39,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/bdw-gc.h"
#include "libguile/threads.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/inline.h"
#include "libguile/chooks.h"

View file

@ -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

View file

@ -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"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/array-handle.h"
#include "libguile/boolean.h"
#include <libguile/error.h>

View file

@ -26,7 +26,6 @@
#include "libguile/gsubr.h"
#include "libguile/error.h"
#include "libguile/__scm.h"
#include "libguile/generalized-vectors.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/snarf.h"

View file

@ -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);

View file

@ -29,7 +29,6 @@
* Erick Gallesio <eg@unice.fr>.
*/
#include "libguile/__scm.h"
#include "libguile/boolean.h"
#include "libguile/list.h"
#include "libguile/ports.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/snarf.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"
SCM_API SCM scm_make_guardian (void);

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
#include <libguile/smob.h>

View file

@ -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);

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/threads.h"

View file

@ -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

View file

@ -19,7 +19,7 @@
#ifndef _SCM_INSTRUCTIONS_H_
#define _SCM_INSTRUCTIONS_H_
#include <libguile/__scm.h>
#include <libguile/scm.h>
#include <libguile/vm-operations.h>
#ifdef BUILDING_LIBGUILE

View file

@ -19,7 +19,7 @@
#ifndef _SCM_VM_INTRINSICS_H_
#define _SCM_VM_INTRINSICS_H_
#include <libguile/__scm.h>
#include <libguile/scm.h>
#ifdef BUILDING_LIBGUILE

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,13 +22,12 @@
#include "libguile/__scm.h"
/* Needed for FD_SET on some systems. */
#include <sys/types.h>
#include <sys/types.h> /* Needed for FD_SET on some systems. */
#include <sys/select.h>
#include "libguile/scm.h"
SCM_API int scm_std_select (int fds,
fd_set *rfds,
fd_set *wfds,

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
#include <libguile/snarf.h>

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/error.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"
SCM_API SCM scm_parse_path (SCM path, SCM tail);

View file

@ -19,7 +19,7 @@
#ifndef _SCM_LOADER_H_
#define _SCM_LOADER_H_
#include <libguile/__scm.h>
#include <libguile/scm.h>
#ifdef BUILDING_LIBGUILE

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"
SCM_API scm_t_bits scm_tc16_malloc;

View file

@ -27,7 +27,6 @@
#include <string.h>
#include <stdio.h>
#include "libguile/__scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,8 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -24,9 +24,7 @@
#include <gmp.h>
#include "libguile/__scm.h"
#include "libguile/error.h"
#include "libguile/gc.h"
#include "libguile/print.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -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));

View file

@ -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))

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,8 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/gc.h"
#include "libguile/error.h"
#include "libguile/print.h"

View file

@ -20,8 +20,6 @@
# include <config.h>
#endif
#include "libguile/__scm.h"
# define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <c-strcase.h>

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/threads.h"

View file

@ -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",

View file

@ -22,8 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/chars.h"
#include <libguile/error.h>
#include <libguile/gc.h>

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/scm.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/boolean.h"
#include <libguile/error.h>

View file

@ -19,7 +19,6 @@
#ifndef _SCM_PROGRAMS_H_
#define _SCM_PROGRAMS_H_
#include <libguile/__scm.h>
#include <libguile/gc.h>
/*

View file

@ -25,9 +25,7 @@
#include <alloca.h>
#include "libguile/__scm.h"
#include "libguile/gsubr.h"
#include "libguile/alist.h"
#include "libguile/async.h"
#include "libguile/continuations.h"

View file

@ -22,7 +22,7 @@
#include "libguile/__scm.h"
#include "libguile/smob.h"

View file

@ -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. */

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>

View file

@ -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);

View file

@ -22,8 +22,6 @@
#include "libguile/__scm.h"
#include "libguile/options.h"

View file

@ -22,7 +22,6 @@
#include "libguile/__scm.h"
#include <libguile/error.h>
SCM_API scm_t_bits scm_tc16_regex;

View file

@ -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);

View file

@ -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 */

Some files were not shown because too many files have changed in this diff Show more