* Fixed two bugs with environment type predicates.

diff --git a/THANKS b/THANKS
index 0ae063d..72ae423 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ The Guile maintainer committee consists of
 Contributors since the last release:
 
        Greg Harvey
+       Jost Boekemeier
 
 For fixes or providing information which led to a fix:
 

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 7741b76..acf2bc4 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-25  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * environments.h (SCM_IMPORT_ENVIRONMENT_P,
+       SCM_EXPORT_ENVIRONMENT_P):  Before fetching the environment
+       functions, make sure that we really got an environment.
+
 2000-09-03  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
 
        * validate.h (SCM_VALIDATE_NUMBER_DEF_COPY): New macro.

diff --git a/libguile/environments.h b/libguile/environments.h
index 1c7683b..9ed5cab 100644 (file)
--- a/libguile/environments.h
+++ b/libguile/environments.h
@@ -176,7 +176,8 @@ extern SCM scm_eval_environment_set_imported_x (SCM env, SCM imported);
 extern void *scm_type_import_environment;
 
 #define SCM_IMPORT_ENVIRONMENT_P(env) \
-  (SCM_ENVIRONMENT_FUNCS (env) == scm_type_import_environment)
+  (SCM_ENVIRONMENT_P (env) \
+   && SCM_ENVIRONMENT_FUNCS (env) == scm_type_import_environment)
 
 extern SCM scm_make_import_environment (SCM imports, SCM conflict_proc);
 extern SCM scm_import_environment_p (SCM env);
@@ -188,7 +189,8 @@ extern SCM scm_import_environment_set_imports_x (SCM env, SCM imports);
 extern void *scm_type_export_environment;
 
 #define SCM_EXPORT_ENVIRONMENT_P(env) \
-  (SCM_ENVIRONMENT_FUNCS (env) == scm_type_export_environment)
+  (SCM_ENVIRONMENT_P (env) \
+   && SCM_ENVIRONMENT_FUNCS (env) == scm_type_export_environment)
 
 extern SCM scm_make_export_environment (SCM private, SCM signature);
 extern SCM scm_export_environment_p (SCM env);