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.)
+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>
* readline.c (scm_readline): Must unpack SCM values to access
AUTOMAKE_OPTIONS = foreign
+## Prevent automake from adding extra -I options
+DEFS = @DEFS@
## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building.
-INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../libguile ${THREAD_CPPFLAGS}
+INCLUDES = -I.. -I$(srcdir)/..
GUILE_SNARF = ../libguile/guile-snarf
#include <sys/time.h>
#include "libguile/validate.h"
-#include "readline.h"
+#include "guile-readline/readline.h"
scm_option scm_readline_opts[] = {
{ SCM_OPTION_BOOLEAN, "history-file", 1,
void
scm_init_readline ()
{
-#include "readline.x"
+#include "guile-readline/readline.x"
scm_readline_completion_function_var
= scm_sysintern ("*readline-completion-function*", SCM_BOOL_F);
rl_getc_function = current_input_getc;
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
instead of SCM_ASSERT (0, ...). (Some compilers will complain
about control reaching end of function otherwise, and, besides,
AUTOMAKE_OPTIONS = foreign
+## Prevent automake from adding extra -I options
+DEFS = @DEFS@
## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## 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/' \
--regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
* If you do not wish that, delete this exception notice. */
\f
-#include "__scm.h"
+#include "libguile/__scm.h"
/* "What's the difference between _scm.h and __scm.h?"
/* Include headers for those files central to the implementation. The
rest should be explicitly #included in the C files themselves. */
-#include "error.h" /* Everyone signals errors. */
-#include "print.h" /* Everyone needs to print. */
-#include "pairs.h" /* Everyone conses. */
-#include "list.h" /* Everyone makes lists. */
-#include "gc.h" /* Everyone allocates. */
-#include "gsubr.h" /* Everyone defines global functions. */
-#include "procs.h" /* Same. */
-#include "numbers.h" /* Everyone deals with fixnums. */
-#include "symbols.h" /* For length, chars, values, miscellany. */
-#include "boolean.h" /* Everyone wonders about the truth. */
-#ifdef USE_THREADS
-#include "threads.h" /* The cooperative thread package does
+#include "libguile/error.h" /* Everyone signals errors. */
+#include "libguile/print.h" /* Everyone needs to print. */
+#include "libguile/pairs.h" /* Everyone conses. */
+#include "libguile/list.h" /* Everyone makes lists. */
+#include "libguile/gc.h" /* Everyone allocates. */
+#include "libguile/gsubr.h" /* Everyone defines global functions. */
+#include "libguile/procs.h" /* Same. */
+#include "libguile/numbers.h" /* Everyone deals with fixnums. */
+#include "libguile/symbols.h" /* For length, chars, values, miscellany. */
+#include "libguile/boolean.h" /* Everyone wonders about the truth. */
+#ifdef USE_THREADS
+#include "libguile/threads.h" /* The cooperative thread package does
switching at async ticks. */
#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
* for errno correct for linking to the C RTL.
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eq.h"
-#include "list.h"
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
+#include "libguile/list.h"
-#include "validate.h"
-#include "alist.h"
+#include "libguile/validate.h"
+#include "libguile/alist.h"
\f
void
scm_init_alist ()
{
-#include "alist.x"
+#include "libguile/alist.x"
}
#endif
#ifdef emacs
-#include "blockinput.h"
+#include "libguile/blockinput.h"
#endif
/* If compiling with GCC 2, this file's not needed. */
\f
#include <stdio.h>
-#include "_scm.h"
-#include "ports.h"
-#include "smob.h"
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/smob.h"
-#include "validate.h"
-#include "arbiters.h"
+#include "libguile/validate.h"
+#include "libguile/arbiters.h"
\f
/* {Arbiters}
{
scm_tc16_arbiter = scm_make_smob_type_mfpe ("arbiter", 0,
scm_markcdr, NULL, prinarb, NULL);
-#include "arbiters.x"
+#include "libguile/arbiters.x"
}
/*
#include <stdio.h>
#include <signal.h>
-#include "_scm.h"
-#include "eval.h"
-#include "throw.h"
-#include "root.h"
-#include "smob.h"
+#include "libguile/_scm.h"
+#include "libguile/eval.h"
+#include "libguile/throw.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
-#include "validate.h"
-#include "async.h"
+#include "libguile/validate.h"
+#include "libguile/async.h"
#ifdef HAVE_STRING_H
#include <string.h>
a_thunk = scm_make_gsubr ("%gc-thunk", 0, 0, 0, scm_sys_gc_async_thunk);
scm_gc_async = scm_system_async (a_thunk);
-#include "async.x"
+#include "libguile/async.x"
}
/*
#include <stdio.h>
#include <ctype.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include "stacks.h"
-#include "srcprop.h"
-#include "struct.h"
-#include "strports.h"
-#include "throw.h"
-#include "fluids.h"
-#include "ports.h"
-#include "strings.h"
+#include "libguile/stacks.h"
+#include "libguile/srcprop.h"
+#include "libguile/struct.h"
+#include "libguile/strports.h"
+#include "libguile/throw.h"
+#include "libguile/fluids.h"
+#include "libguile/ports.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "backtrace.h"
+#include "libguile/validate.h"
+#include "libguile/backtrace.h"
/* {Error reporting and backtraces}
* (A first approximation.)
SCM f = scm_make_fluid ();
scm_the_last_stack_fluid = scm_sysintern ("the-last-stack", f);
-#include "backtrace.x"
+#include "libguile/backtrace.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "validate.h"
-#include "boolean.h"
+#include "libguile/validate.h"
+#include "libguile/boolean.h"
\f
void
scm_init_boolean ()
{
-#include "boolean.x"
+#include "libguile/boolean.x"
}
#include <stdio.h>
#include <ctype.h>
-#include "_scm.h"
-#include "validate.h"
+#include "libguile/_scm.h"
+#include "libguile/validate.h"
-#include "chars.h"
+#include "libguile/chars.h"
\f
SCM_DEFINE (scm_char_p, "char?", 1, 0, 0,
void
scm_init_chars ()
{
-#include "chars.x"
+#include "libguile/chars.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "root.h"
-#include "stackchk.h"
+#include "libguile/_scm.h"
+#include "libguile/root.h"
+#include "libguile/stackchk.h"
#ifdef DEBUG_EXTENSIONS
-#include "debug.h"
+#include "libguile/debug.h"
#endif
-#include "dynwind.h"
+#include "libguile/dynwind.h"
-#include "continuations.h"
+#include "libguile/continuations.h"
\f
void
scm_init_continuations ()
{
-#include "continuations.x"
+#include "libguile/continuations.x"
}
# endif
#ifdef GUILE_ISELECT
-#include "iselect.h"
+#include "libguile/iselect.h"
#endif
#ifdef GUILE_PTHREAD_COMPAT
\f
-#include "validate.h"
-#include "coop-threads.h"
-#include "root.h"
-#include "strings.h"
+#include "libguile/validate.h"
+#include "libguile/coop-threads.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
/* A counter of the current number of threads */
size_t scm_thread_count = 0;
/* This is included rather than compiled separately in order
to simplify the configuration mechanism. */
-#include "coop.c"
+#include "libguile/coop.c"
/* A count-down counter used to determine when to switch
contexts */
#include <time.h>
-#include "coop-defs.h"
-#include "../qt/qt.h"
+#include "libguile/coop-defs.h"
+#include "qt/qt.h"
/* This code is based on a sample thread libraru by David Keppel.
Portions of this file fall under the following copyright: */
* If you do not wish that, delete this exception notice. */
\f
-/* $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 */
#include <errno.h>
-#include <qt.h>
-#include "eval.h"
+#include "qt/qt.h"
+#include "libguile/eval.h"
\f/* #define COOP_STKSIZE (0x10000) */
#define COOP_STKSIZE (scm_eval_stack)
#include <string.h>
#include <stdio.h>
-#include "_scm.h"
-#include "alist.h"
-#include "strings.h"
+#include "libguile/_scm.h"
+#include "libguile/alist.h"
+#include "libguile/strings.h"
#include "debug-malloc.h"
#include <stdio.h>
-#include "_scm.h"
-#include "eval.h"
-#include "stackchk.h"
-#include "throw.h"
-#include "macros.h"
-#include "smob.h"
-#include "procprop.h"
-#include "srcprop.h"
-#include "alist.h"
-#include "continuations.h"
-#include "strports.h"
-#include "read.h"
-#include "feature.h"
-#include "dynwind.h"
-#include "modules.h"
-#include "ports.h"
-#include "root.h"
-
-#include "validate.h"
-#include "debug.h"
+#include "libguile/_scm.h"
+#include "libguile/eval.h"
+#include "libguile/stackchk.h"
+#include "libguile/throw.h"
+#include "libguile/macros.h"
+#include "libguile/smob.h"
+#include "libguile/procprop.h"
+#include "libguile/srcprop.h"
+#include "libguile/alist.h"
+#include "libguile/continuations.h"
+#include "libguile/strports.h"
+#include "libguile/read.h"
+#include "libguile/feature.h"
+#include "libguile/dynwind.h"
+#include "libguile/modules.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+
+#include "libguile/validate.h"
+#include "libguile/debug.h"
\f
/* {Run time control of the debugging evaluator}
* - constant: SCM_IM_DISPATCH
*/
-#include "variable.h"
-#include "procs.h"
+#include "libguile/variable.h"
+#include "libguile/procs.h"
SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
(SCM var, SCM env),
#endif
scm_add_feature ("debug-extensions");
-#include "debug.x"
+#include "libguile/debug.x"
}
/*
#endif
#include <stdio.h>
-#include "_scm.h"
-#include "dynl.h"
-#include "smob.h"
-#include "keywords.h"
-#include "ports.h"
-#include "strings.h"
+#include "libguile/_scm.h"
+#include "libguile/dynl.h"
+#include "libguile/smob.h"
+#include "libguile/keywords.h"
+#include "libguile/ports.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
have ints disabled for the whole lifetime of the created argv (from
scm_set_smob_mark (scm_tc16_dynamic_obj, mark_dynl_obj);
scm_set_smob_print (scm_tc16_dynamic_obj, print_dynl_obj);
sysdep_dynl_init ();
-#include "dynl.x"
+#include "libguile/dynl.x"
kw_global = scm_make_keyword_from_dash_symbol (sym_global);
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eval.h"
-#include "alist.h"
-#include "fluids.h"
-#include "ports.h"
-#include "smob.h"
+#include "libguile/_scm.h"
+#include "libguile/eval.h"
+#include "libguile/alist.h"
+#include "libguile/fluids.h"
+#include "libguile/ports.h"
+#include "libguile/smob.h"
-#include "dynwind.h"
+#include "libguile/dynwind.h"
\f
/* {Dynamic wind}
{
tc16_guards = scm_make_smob_type_mfpe ("guards", 0,
NULL, scm_free0, printguards, NULL);
-#include "dynwind.x"
+#include "libguile/dynwind.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "ramap.h"
-#include "stackchk.h"
-#include "strorder.h"
-#include "async.h"
-#include "root.h"
-#include "smob.h"
-#include "unif.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/ramap.h"
+#include "libguile/stackchk.h"
+#include "libguile/strorder.h"
+#include "libguile/async.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
+#include "libguile/unif.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "eq.h"
+#include "libguile/validate.h"
+#include "libguile/eq.h"
\f
SCM_DEFINE1 (scm_eq_p, "eq?", scm_tc7_rpsubr,
(SCM x, SCM y),
void
scm_init_eq ()
{
-#include "eq.x"
+#include "libguile/eq.x"
}
#include <stdio.h>
-#include "_scm.h"
-#include "pairs.h"
-#include "strings.h"
-#include "throw.h"
+#include "libguile/_scm.h"
+#include "libguile/pairs.h"
+#include "libguile/strings.h"
+#include "libguile/throw.h"
-#include "validate.h"
-#include "error.h"
+#include "libguile/validate.h"
+#include "libguile/error.h"
#ifdef HAVE_STRING_H
#include <string.h>
void
scm_init_error ()
{
-#include "cpp_err_symbols.c"
-#include "error.x"
+#include "libguile/cpp_err_symbols.c"
+#include "libguile/error.x"
}
#ifndef DEVAL
/* 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
directive is indented so pre-ANSI compilers will ignore it, rather
#endif
#include <stdio.h>
-#include "_scm.h"
-#include "debug.h"
-#include "alist.h"
-#include "eq.h"
-#include "continuations.h"
-#include "throw.h"
-#include "smob.h"
-#include "macros.h"
-#include "procprop.h"
-#include "hashtab.h"
-#include "hash.h"
-#include "srcprop.h"
-#include "stackchk.h"
-#include "objects.h"
-#include "async.h"
-#include "feature.h"
-#include "modules.h"
-#include "ports.h"
-#include "root.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "eval.h"
+#include "libguile/_scm.h"
+#include "libguile/debug.h"
+#include "libguile/alist.h"
+#include "libguile/eq.h"
+#include "libguile/continuations.h"
+#include "libguile/throw.h"
+#include "libguile/smob.h"
+#include "libguile/macros.h"
+#include "libguile/procprop.h"
+#include "libguile/hashtab.h"
+#include "libguile/hash.h"
+#include "libguile/srcprop.h"
+#include "libguile/stackchk.h"
+#include "libguile/objects.h"
+#include "libguile/async.h"
+#include "libguile/feature.h"
+#include "libguile/modules.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/eval.h"
SCM (*scm_memoize_method) (SCM, SCM);
scm_sym_trace = SCM_CAR (scm_sysintern ("trace", SCM_UNDEFINED));
#endif
-#include "eval.x"
+#include "libguile/eval.x"
scm_add_feature ("delay");
}
\f
-#include "_scm.h"
-#include "eval.h"
-#include "macros.h"
-#include "modules.h"
-#include "root.h"
+#include "libguile/_scm.h"
+#include "libguile/eval.h"
+#include "libguile/macros.h"
+#include "libguile/modules.h"
+#include "libguile/root.h"
-#include "validate.h"
-#include "evalext.h"
+#include "libguile/validate.h"
+#include "libguile/evalext.h"
SCM_SYMBOL (scm_sym_setter, "setter");
scm_init_evalext ()
{
scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x);
-#include "evalext.x"
+#include "libguile/evalext.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "eval.h"
-#include "ports.h"
-#include "procprop.h"
-#include "root.h"
-#include "smob.h"
-#include "strings.h"
+#include "libguile/eval.h"
+#include "libguile/ports.h"
+#include "libguile/procprop.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "feature.h"
+#include "libguile/validate.h"
+#include "libguile/feature.h"
#ifdef HAVE_STRING_H
#include <string.h>
scm_set_smob_mark (scm_tc16_hook, scm_markcdr);
scm_set_smob_print (scm_tc16_hook, print_hook);
-#include "feature.x"
+#include "libguile/feature.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "smob.h"
-#include "feature.h"
-#include "fports.h"
-#include "iselect.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/smob.h"
+#include "libguile/feature.h"
+#include "libguile/fports.h"
+#include "libguile/iselect.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "filesys.h"
+#include "libguile/validate.h"
+#include "libguile/filesys.h"
\f
#ifdef HAVE_IO_H
scm_sysintern ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC));
#endif
-#include "filesys.x"
+#include "libguile/filesys.x"
}
/*
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-#include "_scm.h"
-#include "print.h"
-#include "smob.h"
-#include "dynwind.h"
-#include "fluids.h"
-#include "alist.h"
-#include "eval.h"
-#include "ports.h"
+#include "libguile/_scm.h"
+#include "libguile/print.h"
+#include "libguile/smob.h"
+#include "libguile/dynwind.h"
+#include "libguile/fluids.h"
+#include "libguile/alist.h"
+#include "libguile/eval.h"
+#include "libguile/ports.h"
#define INITIAL_FLUIDS 10
-#include "validate.h"
+#include "libguile/validate.h"
static volatile int n_fluids;
long scm_tc16_fluid;
{
scm_tc16_fluid = scm_make_smob_type_mfpe ("fluid", 0,
NULL, NULL, print_fluid, NULL);
-#include "fluids.x"
+#include "libguile/fluids.x"
}
/*
#include <stdio.h>
#include <fcntl.h>
-#include "_scm.h"
-#include "strings.h"
+#include "libguile/_scm.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "fports.h"
+#include "libguile/validate.h"
+#include "libguile/fports.h"
#ifdef HAVE_STRING_H
#include <string.h>
#include <errno.h>
-#include "iselect.h"
+#include "libguile/iselect.h"
/* default buffer size, used if the O/S won't supply a value. */
static const int default_buffer_size = 1024;
void
scm_init_fports ()
{
-#include "fports.x"
+#include "libguile/fports.x"
scm_sysintern ("_IOFBF", SCM_MAKINUM (_IOFBF));
scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF));
scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF));
\f
#include <stdio.h>
-#include "_scm.h"
-#include "stime.h"
-#include "stackchk.h"
-#include "struct.h"
-#include "weaks.h"
-#include "guardians.h"
-#include "smob.h"
-#include "unif.h"
-#include "async.h"
-#include "ports.h"
-#include "root.h"
-#include "strings.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "gc.h"
+#include "libguile/_scm.h"
+#include "libguile/stime.h"
+#include "libguile/stackchk.h"
+#include "libguile/struct.h"
+#include "libguile/weaks.h"
+#include "libguile/guardians.h"
+#include "libguile/smob.h"
+#include "libguile/unif.h"
+#include "libguile/async.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/gc.h"
#ifdef GUILE_DEBUG_MALLOC
-#include "debug-malloc.h"
+#include "libguile/debug-malloc.h"
#endif
#ifdef HAVE_MALLOC_H
void
scm_init_gc ()
{
-#include "gc.x"
+#include "libguile/gc.x"
}
/*
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-#include "_scm.h"
+#include "libguile/_scm.h"
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include "tag.h"
-#include "strports.h"
-#include "read.h"
-#include "eval.h"
-#include "chars.h"
-#include "modules.h"
-#include "ports.h"
-#include "root.h"
-#include "strings.h"
-
-#include "gdbint.h"
+#include "libguile/tag.h"
+#include "libguile/strports.h"
+#include "libguile/read.h"
+#include "libguile/eval.h"
+#include "libguile/chars.h"
+#include "libguile/modules.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+
+#include "libguile/gdbint.h"
\f
/* {Support for debugging with gdb}
*
#define GDB_TYPE SCM
-#include "gdb_interface.h"
+#include "libguile/gdb_interface.h"
\f
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
typedef SCM (*gh_eval_t) (void *data, SCM jmpbuf);
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
/* allows you to define new scheme primitives written in C */
SCM
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
typedef void (*main_prog_t) (int argc, char **argv);
typedef void (*repl_prog_t) (int argc, char **argv);
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
void
gh_display (SCM x)
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
/* returns the length of a list */
unsigned long
#include <stdio.h>
-#include <gh.h>
+#include "libguile/gh.h"
/* type predicates: tell you if an SCM object has a given type */
int
#include <math.h>
#include <assert.h>
-#include <gh.h>
+#include "libguile/gh.h"
SCM c_factorial (SCM s_n);
SCM c_sin (SCM s_x);
#include <stdio.h>
#include <math.h>
-#include <gh.h>
+#include "libguile/gh.h"
SCM c_factorial (SCM s_n);
SCM c_sin (SCM s_x);
\f
#include <stdio.h>
-#include "_scm.h"
-#include "procprop.h"
-#include "root.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/procprop.h"
+#include "libguile/root.h"
+#include "libguile/vectors.h"
-#include "gsubr.h"
+#include "libguile/gsubr.h"
\f
/*
* gsubr.c
#include <stdio.h>
#include <assert.h>
-#include "_scm.h"
-#include "ports.h"
-#include "print.h"
-#include "smob.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/print.h"
+#include "libguile/smob.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "guardians.h"
+#include "libguile/validate.h"
+#include "libguile/guardians.h"
static long scm_tc16_guardian;
g_mark, NULL, g_print, NULL);
guard1 = scm_make_subr_opt ("guardian", scm_tc7_subr_2o, guard, 0);
-#include "guardians.x"
+#include "libguile/guardians.x"
}
/*
#include <libguile.h>
#ifdef HAVE_CONFIG_H
-#include <scmconfig.h>
+#include <libguile/scmconfig.h>
#endif
#ifdef DYNAMIC_LINKING
-#include <ltdl.h>
+#include <libltdl/ltdl.h>
#endif
/* Debugger interface (don't change the order of the following lines) */
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "ports.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/ports.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "hash.h"
+#include "libguile/validate.h"
+#include "libguile/hash.h"
\f
#ifndef floor
void
scm_init_hash ()
{
-#include "hash.x"
+#include "libguile/hash.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "alist.h"
-#include "hash.h"
-#include "eval.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "hashtab.h"
+#include "libguile/_scm.h"
+#include "libguile/alist.h"
+#include "libguile/hash.h"
+#include "libguile/eval.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/hashtab.h"
\f
void
scm_init_hashtab ()
{
-#include "hashtab.x"
+#include "libguile/hashtab.x"
}
/*
#include <sys/stat.h>
#include <fcntl.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
/* Everybody has an init function. */
-#include "alist.h"
-#include "arbiters.h"
-#include "async.h"
-#include "backtrace.h"
-#include "boolean.h"
-#include "chars.h"
-#include "continuations.h"
+#include "libguile/alist.h"
+#include "libguile/arbiters.h"
+#include "libguile/async.h"
+#include "libguile/backtrace.h"
+#include "libguile/boolean.h"
+#include "libguile/chars.h"
+#include "libguile/continuations.h"
#ifdef DEBUG_EXTENSIONS
-#include "debug.h"
+#include "libguile/debug.h"
#endif
#ifdef GUILE_DEBUG_MALLOC
-#include "debug-malloc.h"
+#include "libguile/debug-malloc.h"
#endif
-#include "dynl.h"
-#include "dynwind.h"
-#include "eq.h"
-#include "error.h"
-#include "eval.h"
-#include "evalext.h"
-#include "feature.h"
-#include "filesys.h"
-#include "fluids.h"
-#include "fports.h"
-#include "gc.h"
-#include "gdbint.h"
-#include "gsubr.h"
-#include "hash.h"
-#include "hashtab.h"
+#include "libguile/dynl.h"
+#include "libguile/dynwind.h"
+#include "libguile/eq.h"
+#include "libguile/error.h"
+#include "libguile/eval.h"
+#include "libguile/evalext.h"
+#include "libguile/feature.h"
+#include "libguile/filesys.h"
+#include "libguile/fluids.h"
+#include "libguile/fports.h"
+#include "libguile/gc.h"
+#include "libguile/gdbint.h"
+#include "libguile/gsubr.h"
+#include "libguile/hash.h"
+#include "libguile/hashtab.h"
#ifdef GUILE_ISELECT
-#include "iselect.h"
+#include "libguile/iselect.h"
#endif
-#include "ioext.h"
-#include "keywords.h"
-#include "lang.h"
-#include "list.h"
-#include "load.h"
-#include "macros.h"
-#include "mallocs.h"
-#include "modules.h"
-#include "net_db.h"
-#include "numbers.h"
-#include "objects.h"
-#include "objprop.h"
-#include "options.h"
-#include "pairs.h"
-#include "ports.h"
-#include "posix.h"
+#include "libguile/ioext.h"
+#include "libguile/keywords.h"
+#include "libguile/lang.h"
+#include "libguile/list.h"
+#include "libguile/load.h"
+#include "libguile/macros.h"
+#include "libguile/mallocs.h"
+#include "libguile/modules.h"
+#include "libguile/net_db.h"
+#include "libguile/numbers.h"
+#include "libguile/objects.h"
+#include "libguile/objprop.h"
+#include "libguile/options.h"
+#include "libguile/pairs.h"
+#include "libguile/ports.h"
+#include "libguile/posix.h"
#ifdef HAVE_REGCOMP
-#include "regex-posix.h"
+#include "libguile/regex-posix.h"
#endif
-#include "print.h"
-#include "procprop.h"
-#include "procs.h"
-#include "ramap.h"
-#include "random.h"
-#include "read.h"
-#include "scmsigs.h"
-#include "script.h"
-#include "simpos.h"
-#include "smob.h"
-#include "socket.h"
-#include "sort.h"
-#include "srcprop.h"
-#include "stackchk.h"
-#include "stacks.h"
-#include "stime.h"
-#include "strings.h"
-#include "strop.h"
-#include "strorder.h"
-#include "strports.h"
-#include "struct.h"
-#include "symbols.h"
-#include "tag.h"
-#include "throw.h"
-#include "unif.h"
-#include "variable.h"
-#include "vectors.h"
-#include "version.h"
-#include "vports.h"
-#include "weaks.h"
-#include "guardians.h"
-
-#include "init.h"
+#include "libguile/print.h"
+#include "libguile/procprop.h"
+#include "libguile/procs.h"
+#include "libguile/ramap.h"
+#include "libguile/random.h"
+#include "libguile/read.h"
+#include "libguile/scmsigs.h"
+#include "libguile/script.h"
+#include "libguile/simpos.h"
+#include "libguile/smob.h"
+#include "libguile/socket.h"
+#include "libguile/sort.h"
+#include "libguile/srcprop.h"
+#include "libguile/stackchk.h"
+#include "libguile/stacks.h"
+#include "libguile/stime.h"
+#include "libguile/strings.h"
+#include "libguile/strop.h"
+#include "libguile/strorder.h"
+#include "libguile/strports.h"
+#include "libguile/struct.h"
+#include "libguile/symbols.h"
+#include "libguile/tag.h"
+#include "libguile/throw.h"
+#include "libguile/unif.h"
+#include "libguile/variable.h"
+#include "libguile/vectors.h"
+#include "libguile/version.h"
+#include "libguile/vports.h"
+#include "libguile/weaks.h"
+#include "libguile/guardians.h"
+
+#include "libguile/init.h"
#ifdef HAVE_STRING_H
#include <string.h>
#include <stdio.h>
-#include "_scm.h"
-#include "ports.h"
-#include "read.h"
-#include "fports.h"
-#include "unif.h"
-#include "chars.h"
-#include "feature.h"
-#include "root.h"
-#include "strings.h"
-
-#include "validate.h"
-#include "ioext.h"
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/read.h"
+#include "libguile/fports.h"
+#include "libguile/unif.h"
+#include "libguile/chars.h"
+#include "libguile/feature.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+
+#include "libguile/validate.h"
+#include "libguile/ioext.h"
#include <fcntl.h>
{
scm_add_feature ("i/o-extensions");
-#include "ioext.x"
+#include "libguile/ioext.x"
}
#include <limits.h>
#include <string.h>
-#include "_scm.h"
-#include "async.h"
+#include "libguile/_scm.h"
+#include "libguile/async.h"
-#include "iselect.h"
+#include "libguile/iselect.h"
#ifdef GUILE_ISELECT
-#include "coop-threads.h"
+#include "libguile/coop-threads.h"
#ifdef MISSING_BZERO_DECL
extern void bzero (void *, size_t);
timeout0.tv_usec = 0;
#endif
init_bc (0x80, 0, 0);
-#include "iselect.x"
+#include "libguile/iselect.x"
}
#endif /* GUILE_ISELECT */
\f
#include <stdio.h>
-#include "_scm.h"
-#include "ports.h"
-#include "root.h"
-#include "smob.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "keywords.h"
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/keywords.h"
\f
static int
scm_markcdr, NULL, prin_keyword, NULL);
scm_tc16_kw = scm_tc16_keyword;
scm_keyword_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL);
-#include "keywords.x"
+#include "libguile/keywords.x"
}
\f
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "eval.h"
-#include "macros.h"
-#include "root.h"
+#include "libguile/eval.h"
+#include "libguile/macros.h"
+#include "libguile/root.h"
-#include "validate.h"
+#include "libguile/validate.h"
#include "lang.h"
\f
void
scm_init_lang ()
{
-#include "lang.x"
+#include "libguile/lang.x"
scm_make_synt ("nil-while", scm_makacro, scm_m_while);
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eq.h"
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
-#include "validate.h"
-#include "list.h"
+#include "libguile/validate.h"
+#include "libguile/list.h"
#ifdef __STDC__
#include <stdarg.h>
void
scm_init_list ()
{
-#include "list.x"
+#include "libguile/list.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "libpath.h"
-#include "fports.h"
-#include "read.h"
-#include "eval.h"
-#include "throw.h"
-#include "alist.h"
-#include "dynwind.h"
-#include "root.h"
-#include "strings.h"
-
-#include "validate.h"
-#include "load.h"
+#include "libguile/_scm.h"
+#include "libguile/libpath.h"
+#include "libguile/fports.h"
+#include "libguile/read.h"
+#include "libguile/eval.h"
+#include "libguile/throw.h"
+#include "libguile/alist.h"
+#include "libguile/dynwind.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+
+#include "libguile/validate.h"
+#include "libguile/load.h"
#include <sys/types.h>
#include <sys/stat.h>
init_build_info ();
-#include "load.x"
+#include "libguile/load.x"
}
/*
\f
-#include "_scm.h"
-#include "root.h"
-#include "smob.h"
+#include "libguile/_scm.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
-#include "validate.h"
-#include "macros.h"
+#include "libguile/validate.h"
+#include "libguile/macros.h"
long scm_tc16_macro;
{
scm_tc16_macro = scm_make_smob_type_mfpe ("macro", 0,
scm_markcdr, NULL, NULL, NULL);
-#include "macros.x"
+#include "libguile/macros.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "ports.h"
-#include "smob.h"
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/smob.h"
-#include "mallocs.h"
+#include "libguile/mallocs.h"
#ifdef HAVE_MALLOC_H
#include <malloc.h>
\f
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "eval.h"
-#include "procprop.h"
+#include "libguile/eval.h"
+#include "libguile/procprop.h"
-#include "modules.h"
+#include "libguile/modules.h"
static SCM the_root_module;
static SCM root_module_lookup_closure;
void
scm_init_modules ()
{
-#include "modules.x"
+#include "libguile/modules.x"
}
void
\f
#include <stdio.h>
-#include "_scm.h"
-#include "feature.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/feature.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "net_db.h"
+#include "libguile/validate.h"
+#include "libguile/net_db.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
scm_add_feature ("net-db");
-#include "net_db.x"
+#include "libguile/net_db.x"
}
/*
#include <stdio.h>
#include <math.h>
-#include "_scm.h"
-#include "unif.h"
-#include "feature.h"
-#include "ports.h"
-#include "root.h"
-#include "smob.h"
-#include "strings.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "numbers.h"
+#include "libguile/_scm.h"
+#include "libguile/unif.h"
+#include "libguile/feature.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/numbers.h"
\f
#define DIGITS '0':case '1':case '2':case '3':case '4':\
case '5':case '6':case '7':case '8':case '9'
scm_dblprec = scm_dblprec - 1;
}
#endif /* DBL_DIG */
-#include "numbers.x"
+#include "libguile/numbers.x"
}
/*
* libguile. See the comments in objects.h.
*/
-#include "_scm.h"
-
-#include "struct.h"
-#include "procprop.h"
-#include "chars.h"
-#include "keywords.h"
-#include "smob.h"
-#include "eval.h"
-#include "alist.h"
-#include "ports.h"
-#include "strings.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "objects.h"
+#include "libguile/_scm.h"
+
+#include "libguile/struct.h"
+#include "libguile/procprop.h"
+#include "libguile/chars.h"
+#include "libguile/keywords.h"
+#include "libguile/smob.h"
+#include "libguile/eval.h"
+#include "libguile/alist.h"
+#include "libguile/ports.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/objects.h"
\f
SCM scm_metaclass_standard;
SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity);
scm_sysintern ("<entity>", et);
-#include "objects.x"
+#include "libguile/objects.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "hashtab.h"
-#include "alist.h"
-#include "root.h"
-#include "weaks.h"
+#include "libguile/_scm.h"
+#include "libguile/hashtab.h"
+#include "libguile/alist.h"
+#include "libguile/root.h"
+#include "libguile/weaks.h"
-#include "objprop.h"
+#include "libguile/objprop.h"
\f
/* {Object Properties}
scm_init_objprop ()
{
scm_object_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511));
-#include "objprop.x"
+#include "libguile/objprop.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "strings.h"
+#include "libguile/_scm.h"
+#include "libguile/strings.h"
-#include "options.h"
+#include "libguile/options.h"
\f
/* {Run-time options}
scm_init_options ()
{
protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL));
-#include "options.x"
+#include "libguile/options.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "validate.h"
+#include "libguile/validate.h"
\f
scm_init_pairs ()
{
scm_init_iprocs (cxrs, scm_tc7_cxr);
-#include "pairs.x"
+#include "libguile/pairs.x"
}
/* Headers. */
#include <stdio.h>
-#include "_scm.h"
-#include "objects.h"
-#include "smob.h"
-#include "chars.h"
+#include "libguile/_scm.h"
+#include "libguile/objects.h"
+#include "libguile/smob.h"
+#include "libguile/chars.h"
-#include "keywords.h"
-#include "root.h"
-#include "strings.h"
+#include "libguile/keywords.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "ports.h"
+#include "libguile/validate.h"
+#include "libguile/ports.h"
#ifdef HAVE_STRING_H
#include <string.h>
scm_tc16_void_port = scm_make_port_type ("void", fill_input_void_port,
write_void_port);
-#include "ports.x"
+#include "libguile/ports.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "fports.h"
-#include "scmsigs.h"
-#include "feature.h"
-#include "strings.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "posix.h"
+#include "libguile/_scm.h"
+#include "libguile/fports.h"
+#include "libguile/scmsigs.h"
+#include "libguile/feature.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/posix.h"
\f
#ifdef HAVE_STRING_H
scm_sysintern ("PIPE_BUF", scm_long2num (PIPE_BUF));
#endif
-#include "cpp_sig_symbols.c"
-#include "posix.x"
+#include "libguile/cpp_sig_symbols.c"
+#include "libguile/posix.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "smob.h"
-#include "eval.h"
-#include "macros.h"
-#include "procprop.h"
-#include "read.h"
-#include "weaks.h"
-#include "unif.h"
-#include "alist.h"
-#include "struct.h"
-#include "objects.h"
-#include "ports.h"
-#include "root.h"
-#include "strings.h"
-#include "strports.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "print.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/smob.h"
+#include "libguile/eval.h"
+#include "libguile/macros.h"
+#include "libguile/procprop.h"
+#include "libguile/read.h"
+#include "libguile/weaks.h"
+#include "libguile/unif.h"
+#include "libguile/alist.h"
+#include "libguile/struct.h"
+#include "libguile/objects.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/strports.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/print.h"
\f
/* {Names of immediate symbols}
scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
scm_set_smob_print (scm_tc16_port_with_ps, print_port_with_ps);
-#include "print.x"
+#include "libguile/print.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-
-#include "alist.h"
-#include "eval.h"
-#include "procs.h"
-#include "gsubr.h"
-#include "objects.h"
-#include "root.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "procprop.h"
+#include "libguile/_scm.h"
+
+#include "libguile/alist.h"
+#include "libguile/eval.h"
+#include "libguile/procs.h"
+#include "libguile/gsubr.h"
+#include "libguile/objects.h"
+#include "libguile/root.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/procprop.h"
\f
SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
void
scm_init_procprop ()
{
-#include "procprop.x"
+#include "libguile/procprop.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "objects.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/objects.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "procs.h"
+#include "libguile/validate.h"
+#include "libguile/procs.h"
\f
void
scm_init_procs ()
{
-#include "procs.x"
+#include "libguile/procs.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "unif.h"
-#include "smob.h"
-#include "chars.h"
-#include "eq.h"
-#include "eval.h"
-#include "feature.h"
-#include "root.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "ramap.h"
+#include "libguile/_scm.h"
+#include "libguile/unif.h"
+#include "libguile/smob.h"
+#include "libguile/chars.h"
+#include "libguile/eq.h"
+#include "libguile/eval.h"
+#include "libguile/feature.h"
+#include "libguile/root.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/ramap.h"
\f
typedef struct
init_raprocs (ra_asubrs);
scm_make_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p);
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);
}
/* Author: Mikael Djurfeldt <djurfeldt@nada.kth.se> */
-#include "_scm.h"
+#include "libguile/_scm.h"
#include <stdio.h>
#include <math.h>
-#include "smob.h"
-#include "numbers.h"
-#include "feature.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/smob.h"
+#include "libguile/numbers.h"
+#include "libguile/feature.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "random.h"
+#include "libguile/validate.h"
+#include "libguile/random.h"
\f
/*
for (i = m >> 1; i < m; ++i)
scm_masktab[i] = m - 1;
-#include "random.x"
+#include "libguile/random.x"
/* Check that the assumptions about bits per bignum digit are correct. */
#if SIZEOF_INT == 4
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "eval.h"
-#include "unif.h"
-#include "keywords.h"
-#include "alist.h"
-#include "srcprop.h"
-#include "hashtab.h"
-#include "hash.h"
-#include "ports.h"
-#include "root.h"
-#include "strings.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "read.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/eval.h"
+#include "libguile/unif.h"
+#include "libguile/keywords.h"
+#include "libguile/alist.h"
+#include "libguile/srcprop.h"
+#include "libguile/hashtab.h"
+#include "libguile/hash.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/read.h"
\f
SCM_CDRLOC (scm_sysintern ("read-hash-procedures", SCM_EOL));
scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
-#include "read.x"
+#include "libguile/read.x"
}
/*
#include <stdio.h>
#include <sys/types.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
/* Supposedly, this file is never compiled unless we know we have
POSIX regular expressions. But we still put this in an #ifdef so
#endif
#endif
-#include "smob.h"
-#include "symbols.h"
-#include "vectors.h"
-#include "strports.h"
-#include "ports.h"
-#include "feature.h"
-#include "strings.h"
+#include "libguile/smob.h"
+#include "libguile/symbols.h"
+#include "libguile/vectors.h"
+#include "libguile/strports.h"
+#include "libguile/ports.h"
+#include "libguile/feature.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "regex-posix.h"
+#include "libguile/validate.h"
+#include "libguile/regex-posix.h"
/* This is defined by some regex libraries and omitted by others. */
#ifndef REG_BASIC
scm_sysintern ("regexp/notbol", scm_long2num (REG_NOTBOL));
scm_sysintern ("regexp/noteol", scm_long2num (REG_NOTEOL));
-#include "regex-posix.x"
+#include "libguile/regex-posix.x"
scm_add_feature ("regex");
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "stackchk.h"
-#include "dynwind.h"
-#include "eval.h"
-#include "smob.h"
-#include "pairs.h"
-#include "throw.h"
-#include "fluids.h"
-#include "ports.h"
-
-#include "root.h"
+#include "libguile/_scm.h"
+#include "libguile/stackchk.h"
+#include "libguile/dynwind.h"
+#include "libguile/eval.h"
+#include "libguile/smob.h"
+#include "libguile/pairs.h"
+#include "libguile/throw.h"
+#include "libguile/fluids.h"
+#include "libguile/ports.h"
+
+#include "libguile/root.h"
\f
/* Define this if you want to try out the stack allocation of cwdr's
scm_tc16_root = scm_make_smob_type_mfpe ("root", sizeof (struct scm_root_state),
mark_root, NULL, print_root, NULL);
-#include "root.x"
+#include "libguile/root.x"
}
/*
#include <stdio.h>
#include <signal.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "async.h"
-#include "eval.h"
-#include "vectors.h"
+#include "libguile/async.h"
+#include "libguile/eval.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "scmsigs.h"
+#include "libguile/validate.h"
+#include "libguile/scmsigs.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
scm_sysintern ("SA_RESTART", scm_long2num (SA_RESTART));
#endif
-#include "scmsigs.x"
+#include "libguile/scmsigs.x"
}
#include <stdio.h>
#include <ctype.h>
-#include "_scm.h"
-#include "gh.h"
-#include "load.h"
-#include "version.h"
+#include "libguile/_scm.h"
+#include "libguile/gh.h"
+#include "libguile/load.h"
+#include "libguile/version.h"
-#include "script.h"
+#include "libguile/script.h"
#ifdef HAVE_STRING_H
#include <string.h>
void
scm_init_script ()
{
-#include "script.x"
+#include "libguile/script.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "scmsigs.h"
-#include "strings.h"
+#include "libguile/scmsigs.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "simpos.h"
+#include "libguile/validate.h"
+#include "libguile/simpos.h"
#ifdef HAVE_STRING_H
#include <string.h>
void
scm_init_simpos ()
{
-#include "simpos.x"
+#include "libguile/simpos.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "objects.h"
-#include "ports.h"
+#include "libguile/objects.h"
+#include "libguile/ports.h"
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
-#include "smob.h"
+#include "libguile/smob.h"
\f
#include <stdio.h>
-#include "_scm.h"
-#include "unif.h"
-#include "feature.h"
-#include "fports.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/unif.h"
+#include "libguile/feature.h"
+#include "libguile/fports.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "socket.h"
+#include "libguile/validate.h"
+#include "libguile/socket.h"
#ifdef HAVE_STRING_H
#include <string.h>
scm_add_feature ("socket");
scm_init_addr_buffer ();
-#include "socket.x"
+#include "libguile/socket.x"
}
*/
/* 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
directive is indented so pre-ANSI compilers will ignore it, rather
# endif
#endif
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "eval.h"
-#include "unif.h"
-#include "ramap.h"
-#include "alist.h"
-#include "feature.h"
-#include "vectors.h"
+#include "libguile/eval.h"
+#include "libguile/unif.h"
+#include "libguile/ramap.h"
+#include "libguile/alist.h"
+#include "libguile/feature.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "sort.h"
+#include "libguile/validate.h"
+#include "libguile/sort.h"
/* The routine quicksort was extracted from the GNU C Library qsort.c
written by Douglas C. Schmidt (schmidt@ics.uci.edu)
void
scm_init_sort ()
{
-#include "sort.x"
+#include "libguile/sort.x"
scm_add_feature ("sort");
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "smob.h"
-#include "alist.h"
-#include "debug.h"
-#include "hashtab.h"
-#include "hash.h"
-#include "ports.h"
-#include "root.h"
-#include "weaks.h"
+#include "libguile/_scm.h"
+#include "libguile/smob.h"
+#include "libguile/alist.h"
+#include "libguile/debug.h"
+#include "libguile/hashtab.h"
+#include "libguile/hash.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/weaks.h"
-#include "validate.h"
-#include "srcprop.h"
+#include "libguile/validate.h"
+#include "libguile/srcprop.h"
\f
/* {Source Properties}
*
scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
scm_sysintern ("source-whash", scm_source_whash);
-#include "srcprop.x"
+#include "libguile/srcprop.x"
}
void
\f
#include <stdio.h>
-#include "_scm.h"
-#include "ports.h"
-#include "root.h"
+#include "libguile/_scm.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
-#include "stackchk.h"
+#include "libguile/stackchk.h"
\f
/* {Stack Checking}
void
scm_init_stackchk ()
{
-#include "stackchk.x"
+#include "libguile/stackchk.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eval.h"
-#include "debug.h"
-#include "continuations.h"
-#include "struct.h"
-#include "macros.h"
-#include "procprop.h"
-#include "modules.h"
-#include "root.h"
-#include "strings.h"
-
-#include "validate.h"
-#include "stacks.h"
+#include "libguile/_scm.h"
+#include "libguile/eval.h"
+#include "libguile/debug.h"
+#include "libguile/continuations.h"
+#include "libguile/struct.h"
+#include "libguile/macros.h"
+#include "libguile/procprop.h"
+#include "libguile/modules.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+
+#include "libguile/validate.h"
+#include "libguile/stacks.h"
\f
/* {Frames and stacks}
SCM_EOL)));
scm_set_struct_vtable_name_x (scm_stack_type,
SCM_CAR (scm_intern0 ("stack")));
-#include "stacks.x"
+#include "libguile/stacks.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "feature.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/feature.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "stime.h"
+#include "libguile/validate.h"
+#include "libguile/stime.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
if (!scm_my_base) scm_my_base = mytime();
scm_add_feature ("current-time");
-#include "stime.x"
+#include "libguile/stime.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
-#include "strings.h"
-#include "validate.h"
+#include "libguile/strings.h"
+#include "libguile/validate.h"
\f
/* {Strings}
void
scm_init_strings ()
{
-#include "strings.x"
+#include "libguile/strings.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "strings.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/strings.h"
-#include "validate.h"
-#include "strop.h"
-#include "read.h" /*For SCM_CASE_INSENSITIVE_P*/
+#include "libguile/validate.h"
+#include "libguile/strop.h"
+#include "libguile/read.h" /*For SCM_CASE_INSENSITIVE_P*/
#ifdef HAVE_STRING_H
#include <string.h>
void
scm_init_strop ()
{
-#include "strop.x"
+#include "libguile/strop.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
-#include "validate.h"
-#include "strorder.h"
+#include "libguile/validate.h"
+#include "libguile/strorder.h"
\f
SCM_DEFINE1 (scm_string_equal_p, "string=?", scm_tc7_rpsubr,
void
scm_init_strorder ()
{
-#include "strorder.x"
+#include "libguile/strorder.x"
}
\f
-#include "_scm.h"
+#include "libguile/_scm.h"
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include "unif.h"
-#include "eval.h"
-#include "ports.h"
-#include "read.h"
-#include "root.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/unif.h"
+#include "libguile/eval.h"
+#include "libguile/ports.h"
+#include "libguile/read.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "strports.h"
+#include "libguile/strports.h"
#ifdef HAVE_STRING_H
#include <string.h>
void
scm_init_strports ()
{
-#include "strports.x"
+#include "libguile/strports.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "eval.h"
-#include "alist.h"
-#include "weaks.h"
-#include "hashtab.h"
-#include "ports.h"
-#include "strings.h"
-
-#include "validate.h"
-#include "struct.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/eval.h"
+#include "libguile/alist.h"
+#include "libguile/weaks.h"
+#include "libguile/hashtab.h"
+#include "libguile/ports.h"
+#include "libguile/strings.h"
+
+#include "libguile/validate.h"
+#include "libguile/struct.h"
#ifdef HAVE_STRING_H
#include <string.h>
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-offset-user", SCM_MAKINUM (scm_vtable_offset_user));
-#include "struct.x"
+#include "libguile/struct.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "eval.h"
-#include "variable.h"
-#include "alist.h"
-#include "root.h"
-#include "strings.h"
-#include "vectors.h"
-#include "weaks.h"
-
-#include "validate.h"
-#include "symbols.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/eval.h"
+#include "libguile/variable.h"
+#include "libguile/alist.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+#include "libguile/weaks.h"
+
+#include "libguile/validate.h"
+#include "libguile/symbols.h"
#ifdef HAVE_STRING_H
#include <string.h>
{
gensym_counter = 0;
gensym_prefix = scm_permanent_object (scm_makfrom0str ("%%gensym"));
-#include "symbols.x"
+#include "libguile/symbols.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "struct.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/struct.h"
-#include "tag.h"
+#include "libguile/tag.h"
\f
SCM_CONST_LONG (scm_utag_immediate_integer, "utag_immediate_integer", 0);
void
scm_init_tag ()
{
-#include "tag.x"
+#include "libguile/tag.x"
}
*/
#include <stdio.h>
-#include "_scm.h"
-#include "dynwind.h"
-#include "smob.h"
+#include "libguile/_scm.h"
+#include "libguile/dynwind.h"
+#include "libguile/smob.h"
-#include "threads.h"
+#include "libguile/threads.h"
\f
#endif
#ifdef USE_COOP_THREADS
-#include "coop-threads.c"
+#include "libguile/coop-threads.c"
#endif
\f
scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m));
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 */
scm_threads_init (i);
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "smob.h"
-#include "alist.h"
-#include "eval.h"
-#include "eq.h"
-#include "dynwind.h"
-#include "backtrace.h"
+#include "libguile/_scm.h"
+#include "libguile/smob.h"
+#include "libguile/alist.h"
+#include "libguile/eval.h"
+#include "libguile/eq.h"
+#include "libguile/dynwind.h"
+#include "libguile/backtrace.h"
#ifdef DEBUG_EXTENSIONS
-#include "debug.h"
+#include "libguile/debug.h"
#endif
-#include "continuations.h"
-#include "stackchk.h"
-#include "stacks.h"
-#include "fluids.h"
-#include "ports.h"
+#include "libguile/continuations.h"
+#include "libguile/stackchk.h"
+#include "libguile/stacks.h"
+#include "libguile/fluids.h"
+#include "libguile/ports.h"
-#include "validate.h"
-#include "throw.h"
+#include "libguile/validate.h"
+#include "libguile/throw.h"
\f
/* the jump buffer data structure */
NULL,
print_lazy_catch,
NULL);
-#include "throw.x"
+#include "libguile/throw.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "eval.h"
-#include "fports.h"
-#include "smob.h"
-#include "strop.h"
-#include "feature.h"
-#include "root.h"
-#include "strings.h"
-#include "vectors.h"
-
-#include "validate.h"
-#include "unif.h"
-#include "ramap.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/eval.h"
+#include "libguile/fports.h"
+#include "libguile/smob.h"
+#include "libguile/strop.h"
+#include "libguile/feature.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/unif.h"
+#include "libguile/ramap.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
scm_raprin1,
scm_array_equal_p);
scm_add_feature ("array");
-#include "unif.x"
+#include "libguile/unif.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eq.h"
-#include "ports.h"
-#include "root.h"
-#include "smob.h"
-
-#include "validate.h"
-#include "variable.h"
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
+
+#include "libguile/validate.h"
+#include "libguile/variable.h"
\f
static int
scm_tc16_variable = scm_make_smob_type_mfpe ("variable", 0,
scm_markvar, NULL, prin_var, var_equal);
anonymous_variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED));
-#include "variable.x"
+#include "libguile/variable.x"
}
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eq.h"
-#include "root.h"
-#include "strings.h"
-
-#include "validate.h"
-#include "vectors.h"
-#include "unif.h"
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+
+#include "libguile/validate.h"
+#include "libguile/vectors.h"
+#include "libguile/unif.h"
\f
/*
void
scm_init_vectors ()
{
-#include "vectors.x"
+#include "libguile/vectors.x"
/*
scm_make_subr (s_resizuve, scm_tc7_subr_2, scm_vector_set_length_x); */
}
\f
-#include "_scm.h"
-#include "strings.h"
-#include "versiondat.h"
+#include "libguile/_scm.h"
+#include "libguile/strings.h"
+#include "libguile/versiondat.h"
-#include "version.h"
+#include "libguile/version.h"
\f
/* Return a Scheme string containing Guile's major version number. */
void
scm_init_version ()
{
-#include "version.x"
+#include "libguile/version.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "eval.h"
-#include "chars.h"
-#include "fports.h"
-#include "root.h"
-#include "strings.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/eval.h"
+#include "libguile/chars.h"
+#include "libguile/fports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "vports.h"
+#include "libguile/validate.h"
+#include "libguile/vports.h"
#ifdef HAVE_STRING_H
#include <string.h>
void
scm_init_vports ()
{
-#include "vports.x"
+#include "libguile/vports.x"
}
/*
\f
#include <stdio.h>
-#include "_scm.h"
-#include "vectors.h"
+#include "libguile/_scm.h"
+#include "libguile/vectors.h"
-#include "validate.h"
-#include "weaks.h"
+#include "libguile/validate.h"
+#include "libguile/weaks.h"
\f
void
scm_init_weaks ()
{
-#include "weaks.x"
+#include "libguile/weaks.x"
}
+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>
* Makefile.in, md/Makefile.in, time/Makefile.in: Deleted from CVS
lib_LTLIBRARIES = @QTHREAD_LTLIBS@
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_LIBADD = qtmds.lo qtmdc.lo
libqthreads_la_DEPENDENCIES = qtmds.lo qtmdc.lo
-#include "copyright.h"
-#include "qt.h"
+#include "qt/copyright.h"
+#include "qt/qt.h"
#ifdef QT_VARGS_DEFAULT
HCoop / bpt / guile.git / commitdiff