* eval.c: remove superfluous ifndef DEVAL.

* eval.c: distangle. move duplicate code to eval.i.c and include
twice.

* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 4a6749e..e5e7028 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,7 @@
 2007-01-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * eval.c: remove superfluous ifndef DEVAL.
+
        * private-options.h: idem.
 
        * eval.i.c: copyright nitpicking.

diff --git a/libguile/eval.c b/libguile/eval.c
index b48eef7..b51b58f 100644 (file)
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -3162,8 +3162,6 @@ SCM_DEFINE (scm_nconc2last, "apply:nconc2last", 1, 0, 0,
 /* SECTION: The rest of this file is only read once.
  */
 
-#ifndef DEVAL
-
 /* Trampolines
  *  
  * Trampolines make it possible to move procedure application dispatch
@@ -4089,8 +4087,6 @@ scm_init_eval ()
   scm_add_feature ("delay");
 }
 
-#endif /* !DEVAL */
-
 /*
   Local Variables:
   c-file-style: "gnu"