mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 13:00:26 +02:00
Code Activity

* Makefile.am (DEFS): Added. automake adds -I options to DEFS,

Browse source 
and we don't want that.
(INCLUDES): Removed all -I options except for the root source
directory and the root build directory.

* *.*: Change includes so that they always use the "prefixes"
libguile/, qt/, guile-readline/, or libltdl/.
(Thanks to Tim Mooney.)
This commit is contained in:
Mikael Djurfeldt 2000-04-21 14:16:44 +00:00
parent e415cb0666
commit a059974535
100 changed files with 823 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guile-readline/ChangeLog
View file

@ -1,3 +1,13 @@
2000-04-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* *.*: Change includes so that they always use the "prefixes"
libguile/, qt/, guile-readline/, or libltdl/.
* Makefile.am (DEFS): Added. automake adds -I options to DEFS,
and we don't want that.
(INCLUDES): Removed all -I options except for the root source
directory and the root build directory.
2000-04-04 Dirk Herrmann <D.Herrmann@tu-bs.de> 2000-04-04 Dirk Herrmann <D.Herrmann@tu-bs.de>
* readline.c (scm_readline): Must unpack SCM values to access * readline.c (scm_readline): Must unpack SCM values to access

4
guile-readline/Makefile.am
View file

@ -21,10 +21,12 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
## Prevent automake from adding extra -I options
DEFS = @DEFS@
## Check for headers in $(srcdir)/.., so that #include ## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. ## building.
INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../libguile ${THREAD_CPPFLAGS} INCLUDES = -I.. -I$(srcdir)/..
GUILE_SNARF = ../libguile/guile-snarf GUILE_SNARF = ../libguile/guile-snarf

4
guile-readline/readline.c
View file

@ -35,7 +35,7 @@
#include <sys/time.h> #include <sys/time.h>
#include "libguile/validate.h" #include "libguile/validate.h"
#include "readline.h" #include "guile-readline/readline.h"
scm_option scm_readline_opts[] = { scm_option scm_readline_opts[] = {
{ SCM_OPTION_BOOLEAN, "history-file", 1, { SCM_OPTION_BOOLEAN, "history-file", 1,
@ -503,7 +503,7 @@ match_paren (int x, int k)
void void
scm_init_readline () scm_init_readline ()
{ {
#include "readline.x" #include "guile-readline/readline.x"
scm_readline_completion_function_var scm_readline_completion_function_var
= scm_sysintern ("*readline-completion-function*", SCM_BOOL_F); = scm_sysintern ("*readline-completion-function*", SCM_BOOL_F);
rl_getc_function = current_input_getc; rl_getc_function = current_input_getc;

10
libguile/ChangeLog
View file

@ -1,5 +1,15 @@
2000-04-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se> 2000-04-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* *.*: Change includes so that they always use the "prefixes"
libguile/, qt/, guile-readline/, or libltdl/.
(Thanks to Tim Mooney.)
* Makefile.am (INCLUDES): Removed THREAD_CPPFLAGS and INCLTDL.
(DEFS): Added. automake adds -I options to DEFS, and we don't
want that.
Removed all -I options except for the root source directory and
the root build directory.
* numbers.c (scm_odd_p, scm_even_p): Use SCM_WRONG_TYPE_ARG * numbers.c (scm_odd_p, scm_even_p): Use SCM_WRONG_TYPE_ARG
instead of SCM_ASSERT (0, ...). (Some compilers will complain instead of SCM_ASSERT (0, ...). (Some compilers will complain
about control reaching end of function otherwise, and, besides, about control reaching end of function otherwise, and, besides,

4
libguile/Makefile.am
View file

@ -21,10 +21,12 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
## Prevent automake from adding extra -I options
DEFS = @DEFS@
## Check for headers in $(srcdir)/.., so that #include ## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. ## building.
INCLUDES = -I.. -I$(srcdir)/.. ${THREAD_CPPFLAGS} $(INCLTDL) INCLUDES = -I.. -I$(srcdir)/..
ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
--regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'

28
libguile/_scm.h
View file

@ -44,7 +44,7 @@
* If you do not wish that, delete this exception notice. */ * If you do not wish that, delete this exception notice. */
#include "__scm.h" #include "libguile/__scm.h"
/* "What's the difference between _scm.h and __scm.h?" /* "What's the difference between _scm.h and __scm.h?"
@ -60,21 +60,21 @@
/* Include headers for those files central to the implementation. The /* Include headers for those files central to the implementation. The
rest should be explicitly #included in the C files themselves. */ rest should be explicitly #included in the C files themselves. */
#include "error.h" /* Everyone signals errors. */ #include "libguile/error.h" /* Everyone signals errors. */
#include "print.h" /* Everyone needs to print. */ #include "libguile/print.h" /* Everyone needs to print. */
#include "pairs.h" /* Everyone conses. */ #include "libguile/pairs.h" /* Everyone conses. */
#include "list.h" /* Everyone makes lists. */ #include "libguile/list.h" /* Everyone makes lists. */
#include "gc.h" /* Everyone allocates. */ #include "libguile/gc.h" /* Everyone allocates. */
#include "gsubr.h" /* Everyone defines global functions. */ #include "libguile/gsubr.h" /* Everyone defines global functions. */
#include "procs.h" /* Same. */ #include "libguile/procs.h" /* Same. */
#include "numbers.h" /* Everyone deals with fixnums. */ #include "libguile/numbers.h" /* Everyone deals with fixnums. */
#include "symbols.h" /* For length, chars, values, miscellany. */ #include "libguile/symbols.h" /* For length, chars, values, miscellany. */
#include "boolean.h" /* Everyone wonders about the truth. */ #include "libguile/boolean.h" /* Everyone wonders about the truth. */
#ifdef USE_THREADS #ifdef USE_THREADS
#include "threads.h" /* The cooperative thread package does #include "libguile/threads.h" /* The cooperative thread package does
switching at async ticks. */ switching at async ticks. */
#endif #endif
#include "snarf.h" /* Everyone snarfs. */ #include "libguile/snarf.h" /* Everyone snarfs. */
/* On VMS, GNU C's errno.h contains a special hack to get link attributes /* On VMS, GNU C's errno.h contains a special hack to get link attributes
* for errno correct for linking to the C RTL. * for errno correct for linking to the C RTL.

12
libguile/alist.c
View file

@ -44,12 +44,12 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eq.h" #include "libguile/eq.h"
#include "list.h" #include "libguile/list.h"
#include "validate.h" #include "libguile/validate.h"
#include "alist.h" #include "libguile/alist.h"
@ -391,7 +391,7 @@ SCM_DEFINE (scm_assoc_remove_x, "assoc-remove!", 2, 0, 0,
void void
scm_init_alist () scm_init_alist ()
{ {
#include "alist.x" #include "libguile/alist.x"
} }

2
libguile/alloca.c
View file

@ -36,7 +36,7 @@
#endif #endif
#ifdef emacs #ifdef emacs
#include "blockinput.h" #include "libguile/blockinput.h"
#endif #endif
/* If compiling with GCC 2, this file's not needed. */ /* If compiling with GCC 2, this file's not needed. */

12
libguile/arbiters.c
View file

@ -45,12 +45,12 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ports.h" #include "libguile/ports.h"
#include "smob.h" #include "libguile/smob.h"
#include "validate.h" #include "libguile/validate.h"
#include "arbiters.h" #include "libguile/arbiters.h"
/* {Arbiters} /* {Arbiters}
@ -128,7 +128,7 @@ scm_init_arbiters ()
{ {
scm_tc16_arbiter = scm_make_smob_type_mfpe ("arbiter", 0, scm_tc16_arbiter = scm_make_smob_type_mfpe ("arbiter", 0,
scm_markcdr, NULL, prinarb, NULL); scm_markcdr, NULL, prinarb, NULL);
#include "arbiters.x" #include "libguile/arbiters.x"
} }
/* /*

16
libguile/async.c
View file

@ -46,14 +46,14 @@
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "throw.h" #include "libguile/throw.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "validate.h" #include "libguile/validate.h"
#include "async.h" #include "libguile/async.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -498,7 +498,7 @@ scm_init_async ()
a_thunk = scm_make_gsubr ("%gc-thunk", 0, 0, 0, scm_sys_gc_async_thunk); a_thunk = scm_make_gsubr ("%gc-thunk", 0, 0, 0, scm_sys_gc_async_thunk);
scm_gc_async = scm_system_async (a_thunk); scm_gc_async = scm_system_async (a_thunk);
#include "async.x" #include "libguile/async.x"
} }
/* /*

24
libguile/backtrace.c
View file

@ -50,23 +50,23 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include "_scm.h" #include "libguile/_scm.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "stacks.h" #include "libguile/stacks.h"
#include "srcprop.h" #include "libguile/srcprop.h"
#include "struct.h" #include "libguile/struct.h"
#include "strports.h" #include "libguile/strports.h"
#include "throw.h" #include "libguile/throw.h"
#include "fluids.h" #include "libguile/fluids.h"
#include "ports.h" #include "libguile/ports.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "backtrace.h" #include "libguile/backtrace.h"
/* {Error reporting and backtraces} /* {Error reporting and backtraces}
* (A first approximation.) * (A first approximation.)
@ -639,7 +639,7 @@ scm_init_backtrace ()
SCM f = scm_make_fluid (); SCM f = scm_make_fluid ();
scm_the_last_stack_fluid = scm_sysintern ("the-last-stack", f); scm_the_last_stack_fluid = scm_sysintern ("the-last-stack", f);
#include "backtrace.x" #include "libguile/backtrace.x"
} }
/* /*

8
libguile/boolean.c
View file

@ -45,10 +45,10 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "validate.h" #include "libguile/validate.h"
#include "boolean.h" #include "libguile/boolean.h"
@ -76,7 +76,7 @@ SCM_DEFINE (scm_boolean_p, "boolean?", 1, 0, 0,
void void
scm_init_boolean () scm_init_boolean ()
{ {
#include "boolean.x" #include "libguile/boolean.x"
} }

8
libguile/chars.c
View file

@ -46,10 +46,10 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "validate.h" #include "libguile/validate.h"
#include "chars.h" #include "libguile/chars.h"
SCM_DEFINE (scm_char_p, "char?", 1, 0, 0, SCM_DEFINE (scm_char_p, "char?", 1, 0, 0,
@ -397,7 +397,7 @@ int scm_n_charnames = sizeof (scm_charnames) / sizeof (char *);
void void
scm_init_chars () scm_init_chars ()
{ {
#include "chars.x" #include "libguile/chars.x"
} }

14
libguile/continuations.c
View file

@ -45,15 +45,15 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "root.h" #include "libguile/root.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#ifdef DEBUG_EXTENSIONS #ifdef DEBUG_EXTENSIONS
#include "debug.h" #include "libguile/debug.h"
#endif #endif
#include "dynwind.h" #include "libguile/dynwind.h"
#include "continuations.h" #include "libguile/continuations.h"
@ -235,7 +235,7 @@ scm_call_continuation (SCM cont, SCM val)
void void
scm_init_continuations () scm_init_continuations ()
{ {
#include "continuations.x" #include "libguile/continuations.x"
} }

2
libguile/coop-defs.h
View file

@ -62,7 +62,7 @@
# endif # endif
#ifdef GUILE_ISELECT #ifdef GUILE_ISELECT
#include "iselect.h" #include "libguile/iselect.h"
#endif #endif
#ifdef GUILE_PTHREAD_COMPAT #ifdef GUILE_PTHREAD_COMPAT

10
libguile/coop-threads.c
View file

@ -44,17 +44,17 @@
#include "validate.h" #include "libguile/validate.h"
#include "coop-threads.h" #include "libguile/coop-threads.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
/* A counter of the current number of threads */ /* A counter of the current number of threads */
size_t scm_thread_count = 0; size_t scm_thread_count = 0;
/* This is included rather than compiled separately in order /* This is included rather than compiled separately in order
to simplify the configuration mechanism. */ to simplify the configuration mechanism. */
#include "coop.c" #include "libguile/coop.c"
/* A count-down counter used to determine when to switch /* A count-down counter used to determine when to switch
contexts */ contexts */

4
libguile/coop-threads.h
View file

@ -55,8 +55,8 @@
#include <time.h> #include <time.h>
#include "coop-defs.h" #include "libguile/coop-defs.h"
#include "../qt/qt.h" #include "qt/qt.h"
/* This code is based on a sample thread libraru by David Keppel. /* This code is based on a sample thread libraru by David Keppel.
Portions of this file fall under the following copyright: */ Portions of this file fall under the following copyright: */

6
libguile/coop.c
View file

@ -40,7 +40,7 @@
* If you do not wish that, delete this exception notice. */ * If you do not wish that, delete this exception notice. */
/* $Id: coop.c,v 1.24 2000-04-10 12:38:19 mdj Exp $ */ /* $Id: coop.c,v 1.25 2000-04-21 14:16:30 mdj Exp $ */
/* Cooperative thread library, based on QuickThreads */ /* Cooperative thread library, based on QuickThreads */
@ -50,8 +50,8 @@
#include <errno.h> #include <errno.h>
#include <qt.h> #include "qt/qt.h"
#include "eval.h" #include "libguile/eval.h"
/* #define COOP_STKSIZE (0x10000) */ /* #define COOP_STKSIZE (0x10000) */
#define COOP_STKSIZE (scm_eval_stack) #define COOP_STKSIZE (scm_eval_stack)

6
libguile/debug-malloc.c
View file

@ -45,9 +45,9 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "alist.h" #include "libguile/alist.h"
#include "strings.h" #include "libguile/strings.h"
#include "debug-malloc.h" #include "debug-malloc.h"

44
libguile/debug.c
View file

@ -48,26 +48,26 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "throw.h" #include "libguile/throw.h"
#include "macros.h" #include "libguile/macros.h"
#include "smob.h" #include "libguile/smob.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "srcprop.h" #include "libguile/srcprop.h"
#include "alist.h" #include "libguile/alist.h"
#include "continuations.h" #include "libguile/continuations.h"
#include "strports.h" #include "libguile/strports.h"
#include "read.h" #include "libguile/read.h"
#include "feature.h" #include "libguile/feature.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "modules.h" #include "libguile/modules.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "validate.h" #include "libguile/validate.h"
#include "debug.h" #include "libguile/debug.h"
/* {Run time control of the debugging evaluator} /* {Run time control of the debugging evaluator}
@ -248,8 +248,8 @@ scm_make_memoized (SCM exp, SCM env)
* - constant: SCM_IM_DISPATCH * - constant: SCM_IM_DISPATCH
*/ */
#include "variable.h" #include "libguile/variable.h"
#include "procs.h" #include "libguile/procs.h"
SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0, SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
(SCM var, SCM env), (SCM var, SCM env),
@ -641,7 +641,7 @@ scm_init_debug ()
#endif #endif
scm_add_feature ("debug-extensions"); scm_add_feature ("debug-extensions");
#include "debug.x" #include "libguile/debug.x"
} }
/* /*

16
libguile/dynl.c
View file

@ -65,14 +65,14 @@ maybe_drag_in_eprintf ()
#endif #endif
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "dynl.h" #include "libguile/dynl.h"
#include "smob.h" #include "libguile/smob.h"
#include "keywords.h" #include "libguile/keywords.h"
#include "ports.h" #include "libguile/ports.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
/* Converting a list of SCM strings into a argv-style array. You must /* Converting a list of SCM strings into a argv-style array. You must
have ints disabled for the whole lifetime of the created argv (from have ints disabled for the whole lifetime of the created argv (from
@ -558,7 +558,7 @@ scm_init_dynamic_linking ()
scm_set_smob_mark (scm_tc16_dynamic_obj, mark_dynl_obj); scm_set_smob_mark (scm_tc16_dynamic_obj, mark_dynl_obj);
scm_set_smob_print (scm_tc16_dynamic_obj, print_dynl_obj); scm_set_smob_print (scm_tc16_dynamic_obj, print_dynl_obj);
sysdep_dynl_init (); sysdep_dynl_init ();
#include "dynl.x" #include "libguile/dynl.x"
kw_global = scm_make_keyword_from_dash_symbol (sym_global); kw_global = scm_make_keyword_from_dash_symbol (sym_global);
} }

16
libguile/dynwind.c
View file

@ -45,14 +45,14 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "alist.h" #include "libguile/alist.h"
#include "fluids.h" #include "libguile/fluids.h"
#include "ports.h" #include "libguile/ports.h"
#include "smob.h" #include "libguile/smob.h"
#include "dynwind.h" #include "libguile/dynwind.h"
/* {Dynamic wind} /* {Dynamic wind}
@ -273,7 +273,7 @@ scm_init_dynwind ()
{ {
tc16_guards = scm_make_smob_type_mfpe ("guards", 0, tc16_guards = scm_make_smob_type_mfpe ("guards", 0,
NULL, scm_free0, printguards, NULL); NULL, scm_free0, printguards, NULL);
#include "dynwind.x" #include "libguile/dynwind.x"
} }
/* /*

24
libguile/eq.c
View file

@ -44,18 +44,18 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ramap.h" #include "libguile/ramap.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "strorder.h" #include "libguile/strorder.h"
#include "async.h" #include "libguile/async.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "unif.h" #include "libguile/unif.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "eq.h" #include "libguile/eq.h"
SCM_DEFINE1 (scm_eq_p, "eq?", scm_tc7_rpsubr, SCM_DEFINE1 (scm_eq_p, "eq?", scm_tc7_rpsubr,
(SCM x, SCM y), (SCM x, SCM y),
@ -204,7 +204,7 @@ SCM_DEFINE1 (scm_equal_p, "equal?", scm_tc7_rpsubr,
void void
scm_init_eq () scm_init_eq ()
{ {
#include "eq.x" #include "libguile/eq.x"
} }

16
libguile/error.c
View file

@ -46,13 +46,13 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "pairs.h" #include "libguile/pairs.h"
#include "strings.h" #include "libguile/strings.h"
#include "throw.h" #include "libguile/throw.h"
#include "validate.h" #include "libguile/validate.h"
#include "error.h" #include "libguile/error.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -325,8 +325,8 @@ scm_wta (SCM arg, const char *pos, const char *s_subr)
void void
scm_init_error () scm_init_error ()
{ {
#include "cpp_err_symbols.c" #include "libguile/cpp_err_symbols.c"
#include "error.x" #include "libguile/error.x"
} }

48
libguile/eval.c
View file

@ -59,7 +59,7 @@
#ifndef DEVAL #ifndef DEVAL
/* We need this to get the definitions for HAVE_ALLOCA_H, etc. */ /* We need this to get the definitions for HAVE_ALLOCA_H, etc. */
#include "scmconfig.h" #include "libguile/scmconfig.h"
/* AIX requires this to be the first thing in the file. The #pragma /* AIX requires this to be the first thing in the file. The #pragma
directive is indented so pre-ANSI compilers will ignore it, rather directive is indented so pre-ANSI compilers will ignore it, rather
@ -79,29 +79,29 @@ char *alloca ();
#endif #endif
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "debug.h" #include "libguile/debug.h"
#include "alist.h" #include "libguile/alist.h"
#include "eq.h" #include "libguile/eq.h"
#include "continuations.h" #include "libguile/continuations.h"
#include "throw.h" #include "libguile/throw.h"
#include "smob.h" #include "libguile/smob.h"
#include "macros.h" #include "libguile/macros.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "hashtab.h" #include "libguile/hashtab.h"
#include "hash.h" #include "libguile/hash.h"
#include "srcprop.h" #include "libguile/srcprop.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "objects.h" #include "libguile/objects.h"
#include "async.h" #include "libguile/async.h"
#include "feature.h" #include "libguile/feature.h"
#include "modules.h" #include "libguile/modules.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "eval.h" #include "libguile/eval.h"
SCM (*scm_memoize_method) (SCM, SCM); SCM (*scm_memoize_method) (SCM, SCM);
@ -3904,7 +3904,7 @@ scm_init_eval ()
scm_sym_trace = SCM_CAR (scm_sysintern ("trace", SCM_UNDEFINED)); scm_sym_trace = SCM_CAR (scm_sysintern ("trace", SCM_UNDEFINED));
#endif #endif
#include "eval.x" #include "libguile/eval.x"
scm_add_feature ("delay"); scm_add_feature ("delay");
} }

16
libguile/evalext.c
View file

@ -44,14 +44,14 @@
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "macros.h" #include "libguile/macros.h"
#include "modules.h" #include "libguile/modules.h"
#include "root.h" #include "libguile/root.h"
#include "validate.h" #include "libguile/validate.h"
#include "evalext.h" #include "libguile/evalext.h"
SCM_SYMBOL (scm_sym_setter, "setter"); SCM_SYMBOL (scm_sym_setter, "setter");
@ -158,7 +158,7 @@ void
scm_init_evalext () scm_init_evalext ()
{ {
scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x); scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x);
#include "evalext.x" #include "libguile/evalext.x"
} }
/* /*

20
libguile/feature.c
View file

@ -45,17 +45,17 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "ports.h" #include "libguile/ports.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "feature.h" #include "libguile/feature.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -348,7 +348,7 @@ scm_init_feature()
scm_set_smob_mark (scm_tc16_hook, scm_markcdr); scm_set_smob_mark (scm_tc16_hook, scm_markcdr);
scm_set_smob_print (scm_tc16_hook, print_hook); scm_set_smob_print (scm_tc16_hook, print_hook);
#include "feature.x" #include "libguile/feature.x"
} }
/* /*

20
libguile/filesys.c
View file

@ -44,16 +44,16 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "smob.h" #include "libguile/smob.h"
#include "feature.h" #include "libguile/feature.h"
#include "fports.h" #include "libguile/fports.h"
#include "iselect.h" #include "libguile/iselect.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "filesys.h" #include "libguile/filesys.h"
#ifdef HAVE_IO_H #ifdef HAVE_IO_H
@ -1462,7 +1462,7 @@ scm_sysintern ("F_SETOWN", scm_long2num (F_SETOWN));
scm_sysintern ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC)); scm_sysintern ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC));
#endif #endif
#include "filesys.x" #include "libguile/filesys.x"
} }
/* /*

20
libguile/fluids.c
View file

@ -43,17 +43,17 @@
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
#include "_scm.h" #include "libguile/_scm.h"
#include "print.h" #include "libguile/print.h"
#include "smob.h" #include "libguile/smob.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "fluids.h" #include "libguile/fluids.h"
#include "alist.h" #include "libguile/alist.h"
#include "eval.h" #include "libguile/eval.h"
#include "ports.h" #include "libguile/ports.h"
#define INITIAL_FLUIDS 10 #define INITIAL_FLUIDS 10
#include "validate.h" #include "libguile/validate.h"
static volatile int n_fluids; static volatile int n_fluids;
long scm_tc16_fluid; long scm_tc16_fluid;
@ -260,7 +260,7 @@ scm_init_fluids ()
{ {
scm_tc16_fluid = scm_make_smob_type_mfpe ("fluid", 0, scm_tc16_fluid = scm_make_smob_type_mfpe ("fluid", 0,
NULL, NULL, print_fluid, NULL); NULL, NULL, print_fluid, NULL);
#include "fluids.x" #include "libguile/fluids.x"
} }
/* /*

12
libguile/fports.c
View file

@ -46,11 +46,11 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "fports.h" #include "libguile/fports.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -66,7 +66,7 @@ scm_sizet fwrite ();
#include <errno.h> #include <errno.h>
#include "iselect.h" #include "libguile/iselect.h"
/* default buffer size, used if the O/S won't supply a value. */ /* default buffer size, used if the O/S won't supply a value. */
static const int default_buffer_size = 1024; static const int default_buffer_size = 1024;
@ -730,7 +730,7 @@ scm_make_fptob ()
void void
scm_init_fports () scm_init_fports ()
{ {
#include "fports.x" #include "libguile/fports.x"
scm_sysintern ("_IOFBF", SCM_MAKINUM (_IOFBF)); scm_sysintern ("_IOFBF", SCM_MAKINUM (_IOFBF));
scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF)); scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF));
scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF)); scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF));

34
libguile/gc.c
View file

@ -46,25 +46,25 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "stime.h" #include "libguile/stime.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "struct.h" #include "libguile/struct.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "guardians.h" #include "libguile/guardians.h"
#include "smob.h" #include "libguile/smob.h"
#include "unif.h" #include "libguile/unif.h"
#include "async.h" #include "libguile/async.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "gc.h" #include "libguile/gc.h"
#ifdef GUILE_DEBUG_MALLOC #ifdef GUILE_DEBUG_MALLOC
#include "debug-malloc.h" #include "libguile/debug-malloc.h"
#endif #endif
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
@ -2735,7 +2735,7 @@ scm_init_storage (scm_sizet init_heap_size_1, scm_sizet init_heap_size_2)
void void
scm_init_gc () scm_init_gc ()
{ {
#include "gc.x" #include "libguile/gc.x"
} }
/* /*

24
libguile/gdbint.c
View file

@ -47,24 +47,24 @@
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
#include "_scm.h" #include "libguile/_scm.h"
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "tag.h" #include "libguile/tag.h"
#include "strports.h" #include "libguile/strports.h"
#include "read.h" #include "libguile/read.h"
#include "eval.h" #include "libguile/eval.h"
#include "chars.h" #include "libguile/chars.h"
#include "modules.h" #include "libguile/modules.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "gdbint.h" #include "libguile/gdbint.h"
/* {Support for debugging with gdb} /* {Support for debugging with gdb}
* *
@ -77,7 +77,7 @@
#define GDB_TYPE SCM #define GDB_TYPE SCM
#include "gdb_interface.h" #include "libguile/gdb_interface.h"

2
libguile/gh_data.c
View file

@ -43,7 +43,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#endif #endif

2
libguile/gh_eval.c
View file

@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
typedef SCM (*gh_eval_t) (void *data, SCM jmpbuf); typedef SCM (*gh_eval_t) (void *data, SCM jmpbuf);

2
libguile/gh_funcs.c
View file

@ -45,7 +45,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
/* allows you to define new scheme primitives written in C */ /* allows you to define new scheme primitives written in C */
SCM SCM

2
libguile/gh_init.c
View file

@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
typedef void (*main_prog_t) (int argc, char **argv); typedef void (*main_prog_t) (int argc, char **argv);
typedef void (*repl_prog_t) (int argc, char **argv); typedef void (*repl_prog_t) (int argc, char **argv);

2
libguile/gh_io.c
View file

@ -42,7 +42,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
void void
gh_display (SCM x) gh_display (SCM x)

2
libguile/gh_list.c
View file

@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
/* returns the length of a list */ /* returns the length of a list */
unsigned long unsigned long

2
libguile/gh_predicates.c
View file

@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#include <gh.h> #include "libguile/gh.h"
/* type predicates: tell you if an SCM object has a given type */ /* type predicates: tell you if an SCM object has a given type */
int int

2
libguile/gh_test_c.c
View file

@ -44,7 +44,7 @@
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
#include <gh.h> #include "libguile/gh.h"
SCM c_factorial (SCM s_n); SCM c_factorial (SCM s_n);
SCM c_sin (SCM s_x); SCM c_sin (SCM s_x);

2
libguile/gh_test_repl.c
View file

@ -46,7 +46,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <gh.h> #include "libguile/gh.h"
SCM c_factorial (SCM s_n); SCM c_factorial (SCM s_n);
SCM c_sin (SCM s_x); SCM c_sin (SCM s_x);

10
libguile/gsubr.c
View file

@ -45,12 +45,12 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "root.h" #include "libguile/root.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "gsubr.h" #include "libguile/gsubr.h"
/* /*
* gsubr.c * gsubr.c

16
libguile/guardians.c
View file

@ -57,14 +57,14 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ports.h" #include "libguile/ports.h"
#include "print.h" #include "libguile/print.h"
#include "smob.h" #include "libguile/smob.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "guardians.h" #include "libguile/guardians.h"
static long scm_tc16_guardian; static long scm_tc16_guardian;
@ -327,7 +327,7 @@ scm_init_guardian()
g_mark, NULL, g_print, NULL); g_mark, NULL, g_print, NULL);
guard1 = scm_make_subr_opt ("guardian", scm_tc7_subr_2o, guard, 0); guard1 = scm_make_subr_opt ("guardian", scm_tc7_subr_2o, guard, 0);
#include "guardians.x" #include "libguile/guardians.x"
} }
/* /*

4
libguile/guile.c
View file

@ -49,10 +49,10 @@
#include <libguile.h> #include <libguile.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <scmconfig.h> #include <libguile/scmconfig.h>
#endif #endif
#ifdef DYNAMIC_LINKING #ifdef DYNAMIC_LINKING
#include <ltdl.h> #include <libltdl/ltdl.h>
#endif #endif
/* Debugger interface (don't change the order of the following lines) */ /* Debugger interface (don't change the order of the following lines) */

14
libguile/hash.c
View file

@ -45,13 +45,13 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "ports.h" #include "libguile/ports.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "hash.h" #include "libguile/hash.h"
#ifndef floor #ifndef floor
@ -248,7 +248,7 @@ SCM_DEFINE (scm_hash, "hash", 2, 0, 0,
void void
scm_init_hash () scm_init_hash ()
{ {
#include "hash.x" #include "libguile/hash.x"
} }

16
libguile/hashtab.c
View file

@ -45,14 +45,14 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "alist.h" #include "libguile/alist.h"
#include "hash.h" #include "libguile/hash.h"
#include "eval.h" #include "libguile/eval.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "hashtab.h" #include "libguile/hashtab.h"
@ -563,7 +563,7 @@ scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
void void
scm_init_hashtab () scm_init_hashtab ()
{ {
#include "hashtab.x" #include "libguile/hashtab.x"
} }
/* /*

150
libguile/init.c
View file

@ -50,92 +50,92 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "_scm.h" #include "libguile/_scm.h"
/* Everybody has an init function. */ /* Everybody has an init function. */
#include "alist.h" #include "libguile/alist.h"
#include "arbiters.h" #include "libguile/arbiters.h"
#include "async.h" #include "libguile/async.h"
#include "backtrace.h" #include "libguile/backtrace.h"
#include "boolean.h" #include "libguile/boolean.h"
#include "chars.h" #include "libguile/chars.h"
#include "continuations.h" #include "libguile/continuations.h"
#ifdef DEBUG_EXTENSIONS #ifdef DEBUG_EXTENSIONS
#include "debug.h" #include "libguile/debug.h"
#endif #endif
#ifdef GUILE_DEBUG_MALLOC #ifdef GUILE_DEBUG_MALLOC
#include "debug-malloc.h" #include "libguile/debug-malloc.h"
#endif #endif
#include "dynl.h" #include "libguile/dynl.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "eq.h" #include "libguile/eq.h"
#include "error.h" #include "libguile/error.h"
#include "eval.h" #include "libguile/eval.h"
#include "evalext.h" #include "libguile/evalext.h"
#include "feature.h" #include "libguile/feature.h"
#include "filesys.h" #include "libguile/filesys.h"
#include "fluids.h" #include "libguile/fluids.h"
#include "fports.h" #include "libguile/fports.h"
#include "gc.h" #include "libguile/gc.h"
#include "gdbint.h" #include "libguile/gdbint.h"
#include "gsubr.h" #include "libguile/gsubr.h"
#include "hash.h" #include "libguile/hash.h"
#include "hashtab.h" #include "libguile/hashtab.h"
#ifdef GUILE_ISELECT #ifdef GUILE_ISELECT
#include "iselect.h" #include "libguile/iselect.h"
#endif #endif
#include "ioext.h" #include "libguile/ioext.h"
#include "keywords.h" #include "libguile/keywords.h"
#include "lang.h" #include "libguile/lang.h"
#include "list.h" #include "libguile/list.h"
#include "load.h" #include "libguile/load.h"
#include "macros.h" #include "libguile/macros.h"
#include "mallocs.h" #include "libguile/mallocs.h"
#include "modules.h" #include "libguile/modules.h"
#include "net_db.h" #include "libguile/net_db.h"
#include "numbers.h" #include "libguile/numbers.h"
#include "objects.h" #include "libguile/objects.h"
#include "objprop.h" #include "libguile/objprop.h"
#include "options.h" #include "libguile/options.h"
#include "pairs.h" #include "libguile/pairs.h"
#include "ports.h" #include "libguile/ports.h"
#include "posix.h" #include "libguile/posix.h"
#ifdef HAVE_REGCOMP #ifdef HAVE_REGCOMP
#include "regex-posix.h" #include "libguile/regex-posix.h"
#endif #endif
#include "print.h" #include "libguile/print.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "procs.h" #include "libguile/procs.h"
#include "ramap.h" #include "libguile/ramap.h"
#include "random.h" #include "libguile/random.h"
#include "read.h" #include "libguile/read.h"
#include "scmsigs.h" #include "libguile/scmsigs.h"
#include "script.h" #include "libguile/script.h"
#include "simpos.h" #include "libguile/simpos.h"
#include "smob.h" #include "libguile/smob.h"
#include "socket.h" #include "libguile/socket.h"
#include "sort.h" #include "libguile/sort.h"
#include "srcprop.h" #include "libguile/srcprop.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "stacks.h" #include "libguile/stacks.h"
#include "stime.h" #include "libguile/stime.h"
#include "strings.h" #include "libguile/strings.h"
#include "strop.h" #include "libguile/strop.h"
#include "strorder.h" #include "libguile/strorder.h"
#include "strports.h" #include "libguile/strports.h"
#include "struct.h" #include "libguile/struct.h"
#include "symbols.h" #include "libguile/symbols.h"
#include "tag.h" #include "libguile/tag.h"
#include "throw.h" #include "libguile/throw.h"
#include "unif.h" #include "libguile/unif.h"
#include "variable.h" #include "libguile/variable.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "version.h" #include "libguile/version.h"
#include "vports.h" #include "libguile/vports.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "guardians.h" #include "libguile/guardians.h"
#include "init.h" #include "libguile/init.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>

24
libguile/ioext.c
View file

@ -46,18 +46,18 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ports.h" #include "libguile/ports.h"
#include "read.h" #include "libguile/read.h"
#include "fports.h" #include "libguile/fports.h"
#include "unif.h" #include "libguile/unif.h"
#include "chars.h" #include "libguile/chars.h"
#include "feature.h" #include "libguile/feature.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "ioext.h" #include "libguile/ioext.h"
#include <fcntl.h> #include <fcntl.h>
@ -530,7 +530,7 @@ scm_init_ioext ()
{ {
scm_add_feature ("i/o-extensions"); scm_add_feature ("i/o-extensions");
#include "ioext.x" #include "libguile/ioext.x"
} }

10
libguile/iselect.c
View file

@ -43,14 +43,14 @@
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "async.h" #include "libguile/async.h"
#include "iselect.h" #include "libguile/iselect.h"
#ifdef GUILE_ISELECT #ifdef GUILE_ISELECT
#include "coop-threads.h" #include "libguile/coop-threads.h"
#ifdef MISSING_BZERO_DECL #ifdef MISSING_BZERO_DECL
extern void bzero (void *, size_t); extern void bzero (void *, size_t);
@ -621,7 +621,7 @@ scm_init_iselect ()
timeout0.tv_usec = 0; timeout0.tv_usec = 0;
#endif #endif
init_bc (0x80, 0, 0); init_bc (0x80, 0, 0);
#include "iselect.x" #include "libguile/iselect.x"
} }
#endif /* GUILE_ISELECT */ #endif /* GUILE_ISELECT */

16
libguile/keywords.c
View file

@ -45,14 +45,14 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "keywords.h" #include "libguile/keywords.h"
static int static int
@ -138,7 +138,7 @@ scm_init_keywords ()
scm_markcdr, NULL, prin_keyword, NULL); scm_markcdr, NULL, prin_keyword, NULL);
scm_tc16_kw = scm_tc16_keyword; scm_tc16_kw = scm_tc16_keyword;
scm_keyword_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL); scm_keyword_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL);
#include "keywords.x" #include "libguile/keywords.x"
} }

12
libguile/lang.c
View file

@ -44,13 +44,13 @@
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "macros.h" #include "libguile/macros.h"
#include "root.h" #include "libguile/root.h"
#include "validate.h" #include "libguile/validate.h"
#include "lang.h" #include "lang.h"
@ -150,7 +150,7 @@ SCM_DEFINE1 (scm_nil_eq, "nil-eq", scm_tc7_rpsubr,
void void
scm_init_lang () scm_init_lang ()
{ {
#include "lang.x" #include "libguile/lang.x"
scm_make_synt ("nil-while", scm_makacro, scm_m_while); scm_make_synt ("nil-while", scm_makacro, scm_m_while);
} }

10
libguile/list.c
View file

@ -44,11 +44,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eq.h" #include "libguile/eq.h"
#include "validate.h" #include "libguile/validate.h"
#include "list.h" #include "libguile/list.h"
#ifdef __STDC__ #ifdef __STDC__
#include <stdarg.h> #include <stdarg.h>
@ -782,7 +782,7 @@ SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0,
void void
scm_init_list () scm_init_list ()
{ {
#include "list.x" #include "libguile/list.x"
} }
/* /*

26
libguile/load.c
View file

@ -45,19 +45,19 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "libpath.h" #include "libguile/libpath.h"
#include "fports.h" #include "libguile/fports.h"
#include "read.h" #include "libguile/read.h"
#include "eval.h" #include "libguile/eval.h"
#include "throw.h" #include "libguile/throw.h"
#include "alist.h" #include "libguile/alist.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "load.h" #include "libguile/load.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -507,7 +507,7 @@ scm_init_load ()
init_build_info (); init_build_info ();
#include "load.x" #include "libguile/load.x"
} }
/* /*

12
libguile/macros.c
View file

@ -44,12 +44,12 @@
#include "_scm.h" #include "libguile/_scm.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "validate.h" #include "libguile/validate.h"
#include "macros.h" #include "libguile/macros.h"
long scm_tc16_macro; long scm_tc16_macro;
@ -181,7 +181,7 @@ scm_init_macros ()
{ {
scm_tc16_macro = scm_make_smob_type_mfpe ("macro", 0, scm_tc16_macro = scm_make_smob_type_mfpe ("macro", 0,
scm_markcdr, NULL, NULL, NULL); scm_markcdr, NULL, NULL, NULL);
#include "macros.x" #include "libguile/macros.x"
} }
/* /*

8
libguile/mallocs.c
View file

@ -23,11 +23,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ports.h" #include "libguile/ports.h"
#include "smob.h" #include "libguile/smob.h"
#include "mallocs.h" #include "libguile/mallocs.h"
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>

10
libguile/modules.c
View file

@ -44,12 +44,12 @@
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "modules.h" #include "libguile/modules.h"
static SCM the_root_module; static SCM the_root_module;
static SCM root_module_lookup_closure; static SCM root_module_lookup_closure;
@ -179,7 +179,7 @@ scm_system_module_env_p (SCM env)
void void
scm_init_modules () scm_init_modules ()
{ {
#include "modules.x" #include "libguile/modules.x"
} }
void void

14
libguile/net_db.c
View file

@ -52,13 +52,13 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "feature.h" #include "libguile/feature.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "net_db.h" #include "libguile/net_db.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -568,7 +568,7 @@ scm_init_net_db ()
#endif #endif
scm_add_feature ("net-db"); scm_add_feature ("net-db");
#include "net_db.x" #include "libguile/net_db.x"
} }
/* /*

22
libguile/numbers.c
View file

@ -46,17 +46,17 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "unif.h" #include "libguile/unif.h"
#include "feature.h" #include "libguile/feature.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "numbers.h" #include "libguile/numbers.h"
#define DIGITS '0':case '1':case '2':case '3':case '4':\ #define DIGITS '0':case '1':case '2':case '3':case '4':\
case '5':case '6':case '7':case '8':case '9' case '5':case '6':case '7':case '8':case '9'
@ -4656,7 +4656,7 @@ scm_init_numbers ()
scm_dblprec = scm_dblprec - 1; scm_dblprec = scm_dblprec - 1;
} }
#endif /* DBL_DIG */ #endif /* DBL_DIG */
#include "numbers.x" #include "libguile/numbers.x"
} }
/* /*

28
libguile/objects.c
View file

@ -49,21 +49,21 @@
* libguile. See the comments in objects.h. * libguile. See the comments in objects.h.
*/ */
#include "_scm.h" #include "libguile/_scm.h"
#include "struct.h" #include "libguile/struct.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "chars.h" #include "libguile/chars.h"
#include "keywords.h" #include "libguile/keywords.h"
#include "smob.h" #include "libguile/smob.h"
#include "eval.h" #include "libguile/eval.h"
#include "alist.h" #include "libguile/alist.h"
#include "ports.h" #include "libguile/ports.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "objects.h" #include "libguile/objects.h"
SCM scm_metaclass_standard; SCM scm_metaclass_standard;
@ -490,7 +490,7 @@ scm_init_objects ()
SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity); SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity);
scm_sysintern ("<entity>", et); scm_sysintern ("<entity>", et);
#include "objects.x" #include "libguile/objects.x"
} }
/* /*

14
libguile/objprop.c
View file

@ -45,13 +45,13 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "hashtab.h" #include "libguile/hashtab.h"
#include "alist.h" #include "libguile/alist.h"
#include "root.h" #include "libguile/root.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "objprop.h" #include "libguile/objprop.h"
/* {Object Properties} /* {Object Properties}
@ -121,7 +121,7 @@ void
scm_init_objprop () scm_init_objprop ()
{ {
scm_object_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511)); scm_object_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511));
#include "objprop.x" #include "libguile/objprop.x"
} }

8
libguile/options.c
View file

@ -48,10 +48,10 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "strings.h" #include "libguile/strings.h"
#include "options.h" #include "libguile/options.h"
/* {Run-time options} /* {Run-time options}
@ -233,7 +233,7 @@ void
scm_init_options () scm_init_options ()
{ {
protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL)); protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL));
#include "options.x" #include "libguile/options.x"
} }
/* /*

6
libguile/pairs.c
View file

@ -44,10 +44,10 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "validate.h" #include "libguile/validate.h"
@ -164,7 +164,7 @@ void
scm_init_pairs () scm_init_pairs ()
{ {
scm_init_iprocs (cxrs, scm_tc7_cxr); scm_init_iprocs (cxrs, scm_tc7_cxr);
#include "pairs.x" #include "libguile/pairs.x"
} }

20
libguile/ports.c
View file

@ -46,17 +46,17 @@
/* Headers. */ /* Headers. */
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "objects.h" #include "libguile/objects.h"
#include "smob.h" #include "libguile/smob.h"
#include "chars.h" #include "libguile/chars.h"
#include "keywords.h" #include "libguile/keywords.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "ports.h" #include "libguile/ports.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -1402,7 +1402,7 @@ scm_init_ports ()
scm_tc16_void_port = scm_make_port_type ("void", fill_input_void_port, scm_tc16_void_port = scm_make_port_type ("void", fill_input_void_port,
write_void_port); write_void_port);
#include "ports.x" #include "libguile/ports.x"
} }
/* /*

20
libguile/posix.c
View file

@ -45,15 +45,15 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "fports.h" #include "libguile/fports.h"
#include "scmsigs.h" #include "libguile/scmsigs.h"
#include "feature.h" #include "libguile/feature.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "posix.h" #include "libguile/posix.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
@ -1322,8 +1322,8 @@ scm_init_posix ()
scm_sysintern ("PIPE_BUF", scm_long2num (PIPE_BUF)); scm_sysintern ("PIPE_BUF", scm_long2num (PIPE_BUF));
#endif #endif
#include "cpp_sig_symbols.c" #include "libguile/cpp_sig_symbols.c"
#include "posix.x" #include "libguile/posix.x"
} }
/* /*

40
libguile/print.c
View file

@ -45,26 +45,26 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "smob.h" #include "libguile/smob.h"
#include "eval.h" #include "libguile/eval.h"
#include "macros.h" #include "libguile/macros.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "read.h" #include "libguile/read.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "unif.h" #include "libguile/unif.h"
#include "alist.h" #include "libguile/alist.h"
#include "struct.h" #include "libguile/struct.h"
#include "objects.h" #include "libguile/objects.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "strports.h" #include "libguile/strports.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "print.h" #include "libguile/print.h"
/* {Names of immediate symbols} /* {Names of immediate symbols}
@ -1119,7 +1119,7 @@ scm_init_print ()
scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr); scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
scm_set_smob_print (scm_tc16_port_with_ps, print_port_with_ps); scm_set_smob_print (scm_tc16_port_with_ps, print_port_with_ps);
#include "print.x" #include "libguile/print.x"
} }
/* /*

22
libguile/procprop.c
View file

@ -45,18 +45,18 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "alist.h" #include "libguile/alist.h"
#include "eval.h" #include "libguile/eval.h"
#include "procs.h" #include "libguile/procs.h"
#include "gsubr.h" #include "libguile/gsubr.h"
#include "objects.h" #include "libguile/objects.h"
#include "root.h" #include "libguile/root.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "procprop.h" #include "libguile/procprop.h"
SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure"); SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
@ -239,7 +239,7 @@ SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0,
void void
scm_init_procprop () scm_init_procprop ()
{ {
#include "procprop.x" #include "libguile/procprop.x"
} }

14
libguile/procs.c
View file

@ -45,14 +45,14 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "objects.h" #include "libguile/objects.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "procs.h" #include "libguile/procs.h"
@ -392,7 +392,7 @@ scm_init_subr_table ()
void void
scm_init_procs () scm_init_procs ()
{ {
#include "procs.x" #include "libguile/procs.x"
} }
/* /*

24
libguile/ramap.c
View file

@ -52,18 +52,18 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "unif.h" #include "libguile/unif.h"
#include "smob.h" #include "libguile/smob.h"
#include "chars.h" #include "libguile/chars.h"
#include "eq.h" #include "libguile/eq.h"
#include "eval.h" #include "libguile/eval.h"
#include "feature.h" #include "libguile/feature.h"
#include "root.h" #include "libguile/root.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "ramap.h" #include "libguile/ramap.h"
typedef struct typedef struct
@ -2016,7 +2016,7 @@ scm_init_ramap ()
init_raprocs (ra_asubrs); init_raprocs (ra_asubrs);
scm_make_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p); scm_make_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p);
scm_smobs[0x0ff & (scm_tc16_array >> 8)].equalp = scm_raequal; scm_smobs[0x0ff & (scm_tc16_array >> 8)].equalp = scm_raequal;
#include "ramap.x" #include "libguile/ramap.x"
scm_add_feature (s_scm_array_for_each); scm_add_feature (s_scm_array_for_each);
} }

18
libguile/random.c
View file

@ -44,18 +44,18 @@
/* Author: Mikael Djurfeldt <djurfeldt@nada.kth.se> */ /* Author: Mikael Djurfeldt <djurfeldt@nada.kth.se> */
#include "_scm.h" #include "libguile/_scm.h"
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include "smob.h" #include "libguile/smob.h"
#include "numbers.h" #include "libguile/numbers.h"
#include "feature.h" #include "libguile/feature.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "random.h" #include "libguile/random.h"
/* /*
@ -585,7 +585,7 @@ scm_init_random ()
for (i = m >> 1; i < m; ++i) for (i = m >> 1; i < m; ++i)
scm_masktab[i] = m - 1; scm_masktab[i] = m - 1;
#include "random.x" #include "libguile/random.x"
/* Check that the assumptions about bits per bignum digit are correct. */ /* Check that the assumptions about bits per bignum digit are correct. */
#if SIZEOF_INT == 4 #if SIZEOF_INT == 4

32
libguile/read.c
View file

@ -45,22 +45,22 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "eval.h" #include "libguile/eval.h"
#include "unif.h" #include "libguile/unif.h"
#include "keywords.h" #include "libguile/keywords.h"
#include "alist.h" #include "libguile/alist.h"
#include "srcprop.h" #include "libguile/srcprop.h"
#include "hashtab.h" #include "libguile/hashtab.h"
#include "hash.h" #include "libguile/hash.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "read.h" #include "libguile/read.h"
@ -785,7 +785,7 @@ scm_init_read ()
SCM_CDRLOC (scm_sysintern ("read-hash-procedures", SCM_EOL)); SCM_CDRLOC (scm_sysintern ("read-hash-procedures", SCM_EOL));
scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS); scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
#include "read.x" #include "libguile/read.x"
} }
/* /*

22
libguile/regex-posix.c
View file

@ -56,7 +56,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include "_scm.h" #include "libguile/_scm.h"
/* Supposedly, this file is never compiled unless we know we have /* Supposedly, this file is never compiled unless we know we have
POSIX regular expressions. But we still put this in an #ifdef so POSIX regular expressions. But we still put this in an #ifdef so
@ -76,16 +76,16 @@
#endif #endif
#endif #endif
#include "smob.h" #include "libguile/smob.h"
#include "symbols.h" #include "libguile/symbols.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "strports.h" #include "libguile/strports.h"
#include "ports.h" #include "libguile/ports.h"
#include "feature.h" #include "libguile/feature.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "regex-posix.h" #include "libguile/regex-posix.h"
/* This is defined by some regex libraries and omitted by others. */ /* This is defined by some regex libraries and omitted by others. */
#ifndef REG_BASIC #ifndef REG_BASIC
@ -292,7 +292,7 @@ scm_init_regex_posix ()
scm_sysintern ("regexp/notbol", scm_long2num (REG_NOTBOL)); scm_sysintern ("regexp/notbol", scm_long2num (REG_NOTBOL));
scm_sysintern ("regexp/noteol", scm_long2num (REG_NOTEOL)); scm_sysintern ("regexp/noteol", scm_long2num (REG_NOTEOL));
#include "regex-posix.x" #include "libguile/regex-posix.x"
scm_add_feature ("regex"); scm_add_feature ("regex");
} }

22
libguile/root.c
View file

@ -45,17 +45,17 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "eval.h" #include "libguile/eval.h"
#include "smob.h" #include "libguile/smob.h"
#include "pairs.h" #include "libguile/pairs.h"
#include "throw.h" #include "libguile/throw.h"
#include "fluids.h" #include "libguile/fluids.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
/* Define this if you want to try out the stack allocation of cwdr's /* Define this if you want to try out the stack allocation of cwdr's
@ -444,7 +444,7 @@ scm_init_root ()
scm_tc16_root = scm_make_smob_type_mfpe ("root", sizeof (struct scm_root_state), scm_tc16_root = scm_make_smob_type_mfpe ("root", sizeof (struct scm_root_state),
mark_root, NULL, print_root, NULL); mark_root, NULL, print_root, NULL);
#include "root.x" #include "libguile/root.x"
} }
/* /*

14
libguile/scmsigs.c
View file

@ -46,14 +46,14 @@
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "async.h" #include "libguile/async.h"
#include "eval.h" #include "libguile/eval.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "scmsigs.h" #include "libguile/scmsigs.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
@ -522,7 +522,7 @@ scm_init_scmsigs ()
scm_sysintern ("SA_RESTART", scm_long2num (SA_RESTART)); scm_sysintern ("SA_RESTART", scm_long2num (SA_RESTART));
#endif #endif
#include "scmsigs.x" #include "libguile/scmsigs.x"
} }

12
libguile/script.c
View file

@ -46,12 +46,12 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "gh.h" #include "libguile/gh.h"
#include "load.h" #include "libguile/load.h"
#include "version.h" #include "libguile/version.h"
#include "script.h" #include "libguile/script.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -651,7 +651,7 @@ scm_shell (int argc, char **argv)
void void
scm_init_script () scm_init_script ()
{ {
#include "script.x" #include "libguile/script.x"
} }
/* /*

12
libguile/simpos.c
View file

@ -45,13 +45,13 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "scmsigs.h" #include "libguile/scmsigs.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "simpos.h" #include "libguile/simpos.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -135,7 +135,7 @@ SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0,
void void
scm_init_simpos () scm_init_simpos ()
{ {
#include "simpos.x" #include "libguile/simpos.x"
} }

8
libguile/smob.c
View file

@ -45,16 +45,16 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "objects.h" #include "libguile/objects.h"
#include "ports.h" #include "libguile/ports.h"
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>
#endif #endif
#include "smob.h" #include "libguile/smob.h"

18
libguile/socket.c
View file

@ -46,15 +46,15 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "unif.h" #include "libguile/unif.h"
#include "feature.h" #include "libguile/feature.h"
#include "fports.h" #include "libguile/fports.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "socket.h" #include "libguile/socket.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -976,7 +976,7 @@ scm_init_socket ()
scm_add_feature ("socket"); scm_add_feature ("socket");
scm_init_addr_buffer (); scm_init_addr_buffer ();
#include "socket.x" #include "libguile/socket.x"
} }

22
libguile/sort.c
View file

@ -59,7 +59,7 @@
*/ */
/* We need this to get the definitions for HAVE_ALLOCA_H, etc. */ /* We need this to get the definitions for HAVE_ALLOCA_H, etc. */
#include "scmconfig.h" #include "libguile/scmconfig.h"
/* AIX requires this to be the first thing in the file. The #pragma /* AIX requires this to be the first thing in the file. The #pragma
directive is indented so pre-ANSI compilers will ignore it, rather directive is indented so pre-ANSI compilers will ignore it, rather
@ -78,17 +78,17 @@ char *alloca ();
# endif # endif
#endif #endif
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "unif.h" #include "libguile/unif.h"
#include "ramap.h" #include "libguile/ramap.h"
#include "alist.h" #include "libguile/alist.h"
#include "feature.h" #include "libguile/feature.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "sort.h" #include "libguile/sort.h"
/* The routine quicksort was extracted from the GNU C Library qsort.c /* The routine quicksort was extracted from the GNU C Library qsort.c
written by Douglas C. Schmidt (schmidt@ics.uci.edu) written by Douglas C. Schmidt (schmidt@ics.uci.edu)
@ -949,7 +949,7 @@ SCM_DEFINE (scm_sort_list, "sort-list", 2, 0, 0,
void void
scm_init_sort () scm_init_sort ()
{ {
#include "sort.x" #include "libguile/sort.x"
scm_add_feature ("sort"); scm_add_feature ("sort");
} }

24
libguile/srcprop.c
View file

@ -48,18 +48,18 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "smob.h" #include "libguile/smob.h"
#include "alist.h" #include "libguile/alist.h"
#include "debug.h" #include "libguile/debug.h"
#include "hashtab.h" #include "libguile/hashtab.h"
#include "hash.h" #include "libguile/hash.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "validate.h" #include "libguile/validate.h"
#include "srcprop.h" #include "libguile/srcprop.h"
/* {Source Properties} /* {Source Properties}
* *
@ -335,7 +335,7 @@ scm_init_srcprop ()
scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED)); scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
scm_sysintern ("source-whash", scm_source_whash); scm_sysintern ("source-whash", scm_source_whash);
#include "srcprop.x" #include "libguile/srcprop.x"
} }
void void

10
libguile/stackchk.c
View file

@ -45,11 +45,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "stackchk.h" #include "libguile/stackchk.h"
/* {Stack Checking} /* {Stack Checking}
@ -104,7 +104,7 @@ scm_stack_report ()
void void
scm_init_stackchk () scm_init_stackchk ()
{ {
#include "stackchk.x" #include "libguile/stackchk.x"
} }
/* /*

26
libguile/stacks.c
View file

@ -49,19 +49,19 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "debug.h" #include "libguile/debug.h"
#include "continuations.h" #include "libguile/continuations.h"
#include "struct.h" #include "libguile/struct.h"
#include "macros.h" #include "libguile/macros.h"
#include "procprop.h" #include "libguile/procprop.h"
#include "modules.h" #include "libguile/modules.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "stacks.h" #include "libguile/stacks.h"
/* {Frames and stacks} /* {Frames and stacks}
@ -753,7 +753,7 @@ scm_init_stacks ()
SCM_EOL))); SCM_EOL)));
scm_set_struct_vtable_name_x (scm_stack_type, scm_set_struct_vtable_name_x (scm_stack_type,
SCM_CAR (scm_intern0 ("stack"))); SCM_CAR (scm_intern0 ("stack")));
#include "stacks.x" #include "libguile/stacks.x"
} }
/* /*

14
libguile/stime.c
View file

@ -45,13 +45,13 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "feature.h" #include "libguile/feature.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "stime.h" #include "libguile/stime.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
@ -651,7 +651,7 @@ scm_init_stime()
if (!scm_my_base) scm_my_base = mytime(); if (!scm_my_base) scm_my_base = mytime();
scm_add_feature ("current-time"); scm_add_feature ("current-time");
#include "stime.x" #include "libguile/stime.x"
} }

10
libguile/strings.c
View file

@ -45,11 +45,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
/* {Strings} /* {Strings}
@ -378,7 +378,7 @@ SCM_DEFINE (scm_make_shared_substring, "make-shared-substring", 1, 2, 0,
void void
scm_init_strings () scm_init_strings ()
{ {
#include "strings.x" #include "libguile/strings.x"
} }

14
libguile/strop.c
View file

@ -24,13 +24,13 @@ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "strop.h" #include "libguile/strop.h"
#include "read.h" /*For SCM_CASE_INSENSITIVE_P*/ #include "libguile/read.h" /*For SCM_CASE_INSENSITIVE_P*/
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -492,7 +492,7 @@ SCM_DEFINE (scm_string_ci_to_symbol, "string-ci->symbol", 1, 0, 0,
void void
scm_init_strop () scm_init_strop ()
{ {
#include "strop.x" #include "libguile/strop.x"
} }
/* /*

10
libguile/strorder.c
View file

@ -44,11 +44,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "validate.h" #include "libguile/validate.h"
#include "strorder.h" #include "libguile/strorder.h"
SCM_DEFINE1 (scm_string_equal_p, "string=?", scm_tc7_rpsubr, SCM_DEFINE1 (scm_string_equal_p, "string=?", scm_tc7_rpsubr,
@ -233,7 +233,7 @@ SCM_DEFINE1 (scm_string_ci_geq_p, "string-ci>=?", scm_tc7_rpsubr,
void void
scm_init_strorder () scm_init_strorder ()
{ {
#include "strorder.x" #include "libguile/strorder.x"
} }

20
libguile/strports.c
View file

@ -44,22 +44,22 @@
#include "_scm.h" #include "libguile/_scm.h"
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "unif.h" #include "libguile/unif.h"
#include "eval.h" #include "libguile/eval.h"
#include "ports.h" #include "libguile/ports.h"
#include "read.h" #include "libguile/read.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "strports.h" #include "libguile/strports.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -424,7 +424,7 @@ scm_make_stptob ()
void void
scm_init_strports () scm_init_strports ()
{ {
#include "strports.x" #include "libguile/strports.x"
} }

22
libguile/struct.c
View file

@ -45,17 +45,17 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "eval.h" #include "libguile/eval.h"
#include "alist.h" #include "libguile/alist.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "hashtab.h" #include "libguile/hashtab.h"
#include "ports.h" #include "libguile/ports.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "struct.h" #include "libguile/struct.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -764,7 +764,7 @@ scm_init_struct ()
scm_sysintern ("vtable-index-vtable", SCM_MAKINUM (scm_vtable_index_vtable)); scm_sysintern ("vtable-index-vtable", SCM_MAKINUM (scm_vtable_index_vtable));
scm_sysintern ("vtable-index-printer", SCM_MAKINUM (scm_vtable_index_printer)); scm_sysintern ("vtable-index-printer", SCM_MAKINUM (scm_vtable_index_printer));
scm_sysintern ("vtable-offset-user", SCM_MAKINUM (scm_vtable_offset_user)); scm_sysintern ("vtable-offset-user", SCM_MAKINUM (scm_vtable_offset_user));
#include "struct.x" #include "libguile/struct.x"
} }
/* /*

24
libguile/symbols.c
View file

@ -45,18 +45,18 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "eval.h" #include "libguile/eval.h"
#include "variable.h" #include "libguile/variable.h"
#include "alist.h" #include "libguile/alist.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "weaks.h" #include "libguile/weaks.h"
#include "validate.h" #include "libguile/validate.h"
#include "symbols.h" #include "libguile/symbols.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -883,7 +883,7 @@ scm_init_symbols ()
{ {
gensym_counter = 0; gensym_counter = 0;
gensym_prefix = scm_permanent_object (scm_makfrom0str ("%%gensym")); gensym_prefix = scm_permanent_object (scm_makfrom0str ("%%gensym"));
#include "symbols.x" #include "libguile/symbols.x"
} }
/* /*

10
libguile/tag.c
View file

@ -44,11 +44,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "struct.h" #include "libguile/struct.h"
#include "tag.h" #include "libguile/tag.h"
SCM_CONST_LONG (scm_utag_immediate_integer, "utag_immediate_integer", 0); SCM_CONST_LONG (scm_utag_immediate_integer, "utag_immediate_integer", 0);
@ -215,7 +215,7 @@ SCM_DEFINE (scm_tag, "tag", 1, 0, 0,
void void
scm_init_tag () scm_init_tag ()
{ {
#include "tag.x" #include "libguile/tag.x"
} }

12
libguile/threads.c
View file

@ -64,11 +64,11 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "smob.h" #include "libguile/smob.h"
#include "threads.h" #include "libguile/threads.h"
@ -139,7 +139,7 @@ SCM_REGISTER_PROC(s_signal_condition_variable, "signal-condition-variable", 1, 0
#endif #endif
#ifdef USE_COOP_THREADS #ifdef USE_COOP_THREADS
#include "coop-threads.c" #include "libguile/coop-threads.c"
#endif #endif
@ -151,7 +151,7 @@ scm_init_threads (SCM_STACKITEM *i)
scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m)); scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m));
scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c)); scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c));
#include "threads.x" #include "libguile/threads.x"
/* Initialize implementation specific details of the threads support */ /* Initialize implementation specific details of the threads support */
scm_threads_init (i); scm_threads_init (i);
} }

32
libguile/throw.c
View file

@ -45,24 +45,24 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "smob.h" #include "libguile/smob.h"
#include "alist.h" #include "libguile/alist.h"
#include "eval.h" #include "libguile/eval.h"
#include "eq.h" #include "libguile/eq.h"
#include "dynwind.h" #include "libguile/dynwind.h"
#include "backtrace.h" #include "libguile/backtrace.h"
#ifdef DEBUG_EXTENSIONS #ifdef DEBUG_EXTENSIONS
#include "debug.h" #include "libguile/debug.h"
#endif #endif
#include "continuations.h" #include "libguile/continuations.h"
#include "stackchk.h" #include "libguile/stackchk.h"
#include "stacks.h" #include "libguile/stacks.h"
#include "fluids.h" #include "libguile/fluids.h"
#include "ports.h" #include "libguile/ports.h"
#include "validate.h" #include "libguile/validate.h"
#include "throw.h" #include "libguile/throw.h"
/* the jump buffer data structure */ /* the jump buffer data structure */
@ -732,7 +732,7 @@ scm_init_throw ()
NULL, NULL,
print_lazy_catch, print_lazy_catch,
NULL); NULL);
#include "throw.x" #include "libguile/throw.x"
} }
/* /*

28
libguile/unif.c
View file

@ -52,20 +52,20 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "chars.h" #include "libguile/chars.h"
#include "eval.h" #include "libguile/eval.h"
#include "fports.h" #include "libguile/fports.h"
#include "smob.h" #include "libguile/smob.h"
#include "strop.h" #include "libguile/strop.h"
#include "feature.h" #include "libguile/feature.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "unif.h" #include "libguile/unif.h"
#include "ramap.h" #include "libguile/ramap.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
@ -2563,7 +2563,7 @@ scm_init_unif ()
scm_raprin1, scm_raprin1,
scm_array_equal_p); scm_array_equal_p);
scm_add_feature ("array"); scm_add_feature ("array");
#include "unif.x" #include "libguile/unif.x"
} }
/* /*

16
libguile/variable.c
View file

@ -45,14 +45,14 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eq.h" #include "libguile/eq.h"
#include "ports.h" #include "libguile/ports.h"
#include "root.h" #include "libguile/root.h"
#include "smob.h" #include "libguile/smob.h"
#include "validate.h" #include "libguile/validate.h"
#include "variable.h" #include "libguile/variable.h"
static int static int
@ -235,7 +235,7 @@ scm_init_variable ()
scm_tc16_variable = scm_make_smob_type_mfpe ("variable", 0, scm_tc16_variable = scm_make_smob_type_mfpe ("variable", 0,
scm_markvar, NULL, prin_var, var_equal); scm_markvar, NULL, prin_var, var_equal);
anonymous_variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED)); anonymous_variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED));
#include "variable.x" #include "libguile/variable.x"
} }

16
libguile/vectors.c
View file

@ -45,14 +45,14 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eq.h" #include "libguile/eq.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "validate.h" #include "libguile/validate.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "unif.h" #include "libguile/unif.h"
/* /*
@ -381,7 +381,7 @@ SCM_DEFINE (scm_vector_move_right_x, "vector-move-right!", 5, 0, 0,
void void
scm_init_vectors () scm_init_vectors ()
{ {
#include "vectors.x" #include "libguile/vectors.x"
/* /*
scm_make_subr (s_resizuve, scm_tc7_subr_2, scm_vector_set_length_x); */ scm_make_subr (s_resizuve, scm_tc7_subr_2, scm_vector_set_length_x); */
} }

10
libguile/version.c
View file

@ -44,11 +44,11 @@
#include "_scm.h" #include "libguile/_scm.h"
#include "strings.h" #include "libguile/strings.h"
#include "versiondat.h" #include "libguile/versiondat.h"
#include "version.h" #include "libguile/version.h"
/* Return a Scheme string containing Guile's major version number. */ /* Return a Scheme string containing Guile's major version number. */
@ -100,7 +100,7 @@ SCM_DEFINE (scm_version, "version", 0, 0, 0,
void void
scm_init_version () scm_init_version ()
{ {
#include "version.x" #include "libguile/version.x"
} }
/* /*

20
libguile/vports.c
View file

@ -45,16 +45,16 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "eval.h" #include "libguile/eval.h"
#include "chars.h" #include "libguile/chars.h"
#include "fports.h" #include "libguile/fports.h"
#include "root.h" #include "libguile/root.h"
#include "strings.h" #include "libguile/strings.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "vports.h" #include "libguile/vports.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@ -211,7 +211,7 @@ scm_make_sfptob ()
void void
scm_init_vports () scm_init_vports ()
{ {
#include "vports.x" #include "libguile/vports.x"
} }
/* /*

10
libguile/weaks.c
View file

@ -44,11 +44,11 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include "libguile/_scm.h"
#include "vectors.h" #include "libguile/vectors.h"
#include "validate.h" #include "libguile/validate.h"
#include "weaks.h" #include "libguile/weaks.h"
@ -213,7 +213,7 @@ SCM_DEFINE (scm_doubly_weak_hash_table_p, "doubly-weak-hash-table?", 1, 0, 0,
void void
scm_init_weaks () scm_init_weaks ()
{ {
#include "weaks.x" #include "libguile/weaks.x"
} }

10
qt/ChangeLog
View file

@ -1,3 +1,13 @@
2000-04-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* *.*: Change includes so that they always use the "prefixes"
libguile/, qt/, guile-readline/, or libltdl/.
* Makefile.am (DEFS): Added. automake adds -I options to DEFS,
and we don't want that.
(INCLUDES): Removed all -I options except for the root source
directory and the root build directory.
1999-10-05 Jim Blandy <jimb@savonarola.red-bean.com> 1999-10-05 Jim Blandy <jimb@savonarola.red-bean.com>
* Makefile.in, md/Makefile.in, time/Makefile.in: Deleted from CVS * Makefile.in, md/Makefile.in, time/Makefile.in: Deleted from CVS

4
qt/Makefile.am
View file

@ -27,6 +27,10 @@ SUBDIRS = md time
lib_LTLIBRARIES = @QTHREAD_LTLIBS@ lib_LTLIBRARIES = @QTHREAD_LTLIBS@
EXTRA_LTLIBRARIES = libqthreads.la EXTRA_LTLIBRARIES = libqthreads.la
## Prevent automake from adding extra -I options
DEFS = @DEFS@
INCLUDES = -I.. -I$(srcdir)/..
libqthreads_la_SOURCES = qt.c copyright.h libqthreads_la_SOURCES = qt.c copyright.h
libqthreads_la_LIBADD = qtmds.lo qtmdc.lo libqthreads_la_LIBADD = qtmds.lo qtmdc.lo
libqthreads_la_DEPENDENCIES = qtmds.lo qtmdc.lo libqthreads_la_DEPENDENCIES = qtmds.lo qtmdc.lo

4
qt/qt.c
View file

@ -1,5 +1,5 @@
#include "copyright.h" #include "qt/copyright.h"
#include "qt.h" #include "qt/qt.h"
#ifdef QT_VARGS_DEFAULT #ifdef QT_VARGS_DEFAULT