diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1998-05-02 22:26:44 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1998-05-02 22:26:44 +0000 |
commit | 104d453328e31200fd6e547d4bbe95fc160080a9 (patch) | |
tree | 724cd1a0cb6444c8de5ef50832563a4d84f20613 | |
parent | 680ed4a802c872a31720d0503a941e96c93c9495 (diff) | |
download | guile-104d453328e31200fd6e547d4bbe95fc160080a9.tar.gz |
* fluids.c: Removed use of assert.h (in order to avoid
__eprintf).
* Makefile.am (libguile_la_LDFLAGS): Added -export-dynamic.
* dynl.c (maybe_drag_in_eprintf): Disabled through #ifdef 0.
-rw-r--r-- | libguile/ChangeLog | 7 | ||||
-rw-r--r-- | libguile/Makefile.am | 2 | ||||
-rw-r--r-- | libguile/dynl.c | 2 | ||||
-rw-r--r-- | libguile/fluids.c | 6 |
4 files changed, 10 insertions, 7 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 95c46780b..d28bd05be 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,12 @@ 1998-05-02 Mikael Djurfeldt <mdj@mdj.nada.kth.se> + * fluids.c: Removed use of assert.h (in order to avoid + __eprintf). + + * Makefile.am (libguile_la_LDFLAGS): Added -export-dynamic. + + * dynl.c (maybe_drag_in_eprintf): Disabled through #ifdef 0. + * eval.c (SCM_CEVAL): Do more thorough argument checking. This change makes the evaluator safer at the cost of evaluation speed. It handles the case when the user has added a non-immediate diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 1b7943ae7..a099d0693 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -59,7 +59,7 @@ noinst_HEADERS = coop-threads.c coop-threads.h coop.c libguile_la_DEPENDENCIES = @LIBLOBJS@ libguile_la_LIBADD = @LIBLOBJS@ -libguile_la_LDFLAGS = -version-info 3:0 +libguile_la_LDFLAGS = -version-info 3:0 -export-dynamic include_HEADERS = libguile.h diff --git a/libguile/dynl.c b/libguile/dynl.c index 7560c687c..0637b1217 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -45,6 +45,7 @@ Author: Aubrey Jaffer Modified for libguile by Marius Vollmer */ +#if 0 /* Disabled until we know for sure that it isn't needed */ /* XXX - This is only here to drag in a definition of __eprintf. This is needed for proper operation of dynamic linking. The real solution would probably be a shared libgcc. */ @@ -57,6 +58,7 @@ maybe_drag_in_eprintf () { assert (!maybe_drag_in_eprintf); } +#endif #include <stdio.h> #include "_scm.h" diff --git a/libguile/fluids.c b/libguile/fluids.c index f3273f6f4..225709c92 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -39,8 +39,6 @@ * whether to permit this exception to apply to your modifications. * If you do not wish that, delete this exception notice. */ -#include <assert.h> - #include "_scm.h" #include "print.h" #include "smob.h" @@ -71,9 +69,7 @@ grow_fluids (root_state, new_length) int old_length, i; old_fluids = root_state->fluids; - assert (SCM_NIMP (old_fluids) && SCM_VECTORP (old_fluids)); old_length = SCM_LENGTH (old_fluids); - assert (old_length <= new_length); new_fluids = scm_make_vector (SCM_MAKINUM (new_length), SCM_BOOL_F, SCM_BOOL_F); i = 0; @@ -169,7 +165,6 @@ scm_fluid_ref (fl) SCM_ASSERT (SCM_NIMP (fl) && SCM_FLUIDP (fl), fl, SCM_ARG1, s_fluid_ref); n = SCM_FLUID_NUM (fl); - assert (n >= 0 && n < n_fluids); if (SCM_LENGTH (scm_root->fluids) <= n) grow_fluids (scm_root, n+1); @@ -188,7 +183,6 @@ scm_fluid_set_x (fl, val) SCM_ASSERT (SCM_NIMP (fl) && SCM_FLUIDP (fl), fl, SCM_ARG1, s_fluid_set_x); n = SCM_FLUID_NUM (fl); - assert (n >= 0 && n < n_fluids); if (SCM_LENGTH (scm_root->fluids) <= n) grow_fluids (scm_root, n+1); |