From eebc7d39f9552e5d2338282224056f0e19ed3056 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 10 Sep 1996 02:28:18 +0000 Subject: [PATCH] * __scm.h, libguile.h: Use "quotes" in the #includes, not ; this allows `make depends' to work properly. * libguile.h: #include smob.h and pairs.h before the others; they define typedefs used by other headers. C files should #include only the header files they need, not libguile.h (which #includes all the header files); the pointless recompilation was wasting my time. * Makefile.in (all .o dependency lists): Regenerated. * libguile.h: Don't try to get a definition for size_t here... * __scm.h: Do it here. * _scm.h: Since this is the internal libguile header, put things here that all (or a majority) of the libguile files will want. Don't #include here; that generates dependencies on way too much. Instead, get "__scm.h", "error.h", "pairs.h", "list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h", "boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and "async.h". * alist.c: Get "eq.h", "list.h", "alist.h". * append.c: Get "append.h", "list.h". * arbiters.c: Get "arbiters.h", "smob.h". * async.c: Get "async.h", "smob.h", "throw.h", "eval.h". * boolean.c: Get "boolean.h". * chars.c: Get "chars.h". * continuations.c: Get "continuations.h", "dynwind.h", "debug.h", "stackchk.h". * debug.c: Get "debug.h", "feature.h", "read.h", "strports.h", "continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h", "genio.h", "throw.h", "eval.h". * dynwind.c: Get "dynwind.h", "alist.h", "eval.h". * eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h", "stackchk.h". * error.c: Get "error.h", "throw.h", "genio.h", "pairs.h". * eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h", "hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h", "continuations.h", "eq.h", "sequences.h", "alist.h", "append.h", "debug.h". * fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h". * feature.c: Get "feature.h". * files.c: Get "files.h". * filesys.c: Get "filesys.h", "smob.h", "genio.h". * fports.c: Get "fports.h", "markers.h". * gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h", "genio.h", "struct.h", "stackchk.h", "stime.h". * gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h", "read.h", "strports.h", "tag.h". * genio.c: Get "genio.h", "chars.h". * gsubr.c: Get "gsubr.h", "genio.h". * hash.c: Get "hash.h", "chars.h". * hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h". * init.c: Get everyone who has an scm_init_mumble function: "weaks.h", "vports.h", "version.h", "vectors.h", "variable.h", "unif.h", "throw.h", "tag.h", "symbols.h", "struct.h", "strports.h", "strorder.h", "strop.h", "strings.h", "stime.h", "stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h", "scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h", "print.h", "posix.h", "ports.h", "pairs.h", "options.h", "objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h", "list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h", "gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h", "feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h", "dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h", "async.h", "arbiters.h", "append.h", "alist.h". * ioext.c: Get "ioext.h", "fports.h". * kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h". * list.c: Get "list.h", "eq.h". * load.c: Get "load.h", "eval.h", "read.h", "fports.h". * mallocs.c: Get "smob.h", "genio.h". * markers.c: Get "markers.h". * mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h", "chars.h". * numbers.c: Get "unif.h", "genio.h". * objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h". * options.c: Get "options.h". * ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h", "markers.h", "chars.h", "genio.h". * posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h", "read.h", "scmsigs.h", "genio.h", "fports.h". * print.c: Get "print.h", "unif.h", "weaks.h", "read.h", "procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h", "chars.h". * procprop.c: Get "procprop.h", "eval.h", "alist.h". * procs.c: Get "procs.h". * ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h", "chars.h", "smob.h", "unif.h". * read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h", "eval.h", "genio.h", "chars.h". * root.c: Get "root.h", "stackchk.h". * scmsigs.c: Get "scmsigs.h". * sequences.c: Get "sequences.h". * simpos.c: Get "simpos.h", "scmsigs.h". * smob.c: Get "smob.h". * socket.c: Get "socket.h", "feature.h". * srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h", "alist.h", "smob.h". * stackchk.c: Get "stackchk.h", "genio.h". * stime.c: Get "stime.h"."libguile/continuations.h". * strings.c: Get "strings.h", "chars.h". * strop.c: Get "strop.h", "chars.h". * strorder.c: Get "strorder.h", "chars.h". * strports.c: Get "strports.h", "print.h", "eval.h", "unif.h". * struct.c: Get "struct.h", "chars.h". * symbols.c: Get "symbols.h", "mbstrings.h", "alist.h", "variable.h", "eval.h", "chars.h". * tag.c: Get "tag.h", "struct.h", "chars.h". * throw.c: Get "throw.h", "continuations.h", "debug.h", "dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h". * unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h", "smob.h", "genio.h", "eval.h", "chars.h". * variable.c: Get "variable.h", "smob.h", "genio.h". * vectors.c: Get "vectors.h", "eq.h". * version.c: Get "version.h". * vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h". * weaks.c: Get "weaks.h". --- libguile/libguile.h | 158 ++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 86 deletions(-) diff --git a/libguile/libguile.h b/libguile/libguile.h index 41a840db4..083b018c8 100644 --- a/libguile/libguile.h +++ b/libguile/libguile.h @@ -45,96 +45,82 @@ -#include +#include "libguile/__scm.h" -#ifdef STDC_HEADERS -# include -# ifdef AMIGA -# include -# endif /* def AMIGA */ -# define scm_sizet size_t -#else -# ifdef _SIZE_T -# define scm_sizet size_t -# else -# define scm_sizet unsigned int -# endif /* def _SIZE_T */ -#endif /* def STDC_HEADERS */ +/* These files define typedefs used by later files, so they need to + come first. */ +#include "libguile/smob.h" +#include "libguile/pairs.h" -#include - - - -#include -#include -#include -#include -#include -#include -#include +#include "libguile/alist.h" +#include "libguile/append.h" +#include "libguile/arbiters.h" +#include "libguile/async.h" +#include "libguile/boolean.h" +#include "libguile/chars.h" +#include "libguile/continuations.h" #ifdef DEBUG_EXTENSIONS -#include +#include "libguile/debug.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "libguile/dynwind.h" +#include "libguile/eq.h" +#include "libguile/error.h" +#include "libguile/eval.h" +#include "libguile/extchrs.h" +#include "libguile/fdsocket.h" +#include "libguile/feature.h" +#include "libguile/files.h" +#include "libguile/filesys.h" +#include "libguile/fports.h" +#include "libguile/gc.h" +#include "libguile/gdbint.h" +#include "libguile/genio.h" +#include "libguile/gsubr.h" +#include "libguile/hash.h" +#include "libguile/hashtab.h" +#include "libguile/init.h" +#include "libguile/ioext.h" +#include "libguile/kw.h" +#include "libguile/list.h" +#include "libguile/load.h" +#include "libguile/mallocs.h" +#include "libguile/markers.h" +#include "libguile/marksweep.h" +#include "libguile/mbstrings.h" +#include "libguile/numbers.h" +#include "libguile/objprop.h" +#include "libguile/options.h" +#include "libguile/params.h" +#include "libguile/ports.h" +#include "libguile/posix.h" +#include "libguile/print.h" +#include "libguile/procprop.h" +#include "libguile/procs.h" +#include "libguile/ramap.h" +#include "libguile/read.h" +#include "libguile/root.h" +#include "libguile/scmsigs.h" +#include "libguile/sequences.h" +#include "libguile/simpos.h" +#include "libguile/socket.h" +#include "libguile/srcprop.h" +#include "libguile/stackchk.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/tags.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"