(SRFI-1 Deleting): Rewrite delete and

[bpt/guile.git] / libguile.h

diff --git a/libguile.h b/libguile.h
index 7e99e0e..10083be 100644 (file)
--- a/libguile.h
+++ b/libguile.h
@@ -1,7 +1,7 @@
-#ifndef LIBGUILEH
-#define LIBGUILEH
+#ifndef SCM_LIBGUILE_H
+#define SCM_LIBGUILE_H
 
-/*     Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,35 +48,24 @@ extern "C" {
 #endif
 
 #include "libguile/__scm.h"
-
-/* These files define typedefs used by later files, so they need to
-   come first.  */
-#include "libguile/print.h"
-#include "libguile/smob.h"
-#include "libguile/pairs.h"
-
 #include "libguile/alist.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 "libguile/backtrace.h"
-#include "libguile/debug.h"
-#include "libguile/stacks.h"
-#endif
-#include "libguile/dump.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/extensions.h"
 #include "libguile/feature.h"
 #include "libguile/filesys.h"
 #include "libguile/fluids.h"
 #include "libguile/fports.h"
+#include "libguile/futures.h"
 #include "libguile/gc.h"
 #include "libguile/gdbint.h"
 #include "libguile/goops.h"
@@ -87,6 +76,7 @@ extern "C" {
 #include "libguile/init.h"
 #include "libguile/ioext.h"
 #include "libguile/rdelim.h"
+#include "libguile/rw.h"
 #include "libguile/keywords.h"
 #include "libguile/list.h"
 #include "libguile/load.h"
@@ -98,8 +88,10 @@ extern "C" {
 #include "libguile/objects.h"
 #include "libguile/objprop.h"
 #include "libguile/options.h"
+#include "libguile/pairs.h"
 #include "libguile/ports.h"
 #include "libguile/posix.h"
+#include "libguile/print.h"
 #include "libguile/procprop.h"
 #include "libguile/properties.h"
 #include "libguile/procs.h"
@@ -110,6 +102,7 @@ extern "C" {
 #include "libguile/scmsigs.h"
 #include "libguile/script.h"
 #include "libguile/simpos.h"
+#include "libguile/smob.h"
 #include "libguile/snarf.h"
 #include "libguile/socket.h"
 #include "libguile/sort.h"
@@ -122,19 +115,22 @@ extern "C" {
 #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/validate.h"
+#include "libguile/values.h"
 #include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/version.h"
 #include "libguile/vports.h"
 #include "libguile/weaks.h"
-#ifdef USE_THREADS
+#include "libguile/backtrace.h"
+#include "libguile/debug.h"
+#include "libguile/stacks.h"
 #include "libguile/threads.h"
-#endif
+#include "libguile/inline.h"
+#include "libguile/deprecated.h"
 
 #ifdef __cplusplus
 }
@@ -142,7 +138,7 @@ extern "C" {
 
 \f
 
-#endif  /* LIBGUILEH */
+#endif  /* SCM_LIBGUILE_H */
 
 /*
   Local Variables: