diff options
author | Keisuke Nishida <kxn30@po.cwru.edu> | 2001-03-30 02:50:38 +0000 |
---|---|---|
committer | Keisuke Nishida <kxn30@po.cwru.edu> | 2001-03-30 02:50:38 +0000 |
commit | 1b27e91a9b190050c23fb609b5463c2e12ca8913 (patch) | |
tree | df79fb53f30edd1ef412660544ba3bc9470926e7 | |
parent | 16c634ec156fa9bf0beddfe0b8e0177c329a4a16 (diff) | |
download | guile-1b27e91a9b190050c23fb609b5463c2e12ca8913.tar.gz |
* goops.c, goops.h (scm_init_oop_goops_goopscore_module): Deprecated.
* init.c (scm_init_guile_1): Don't init goopscore module.
-rw-r--r-- | libguile/ChangeLog | 5 | ||||
-rw-r--r-- | libguile/goops.c | 4 | ||||
-rw-r--r-- | libguile/goops.h | 2 | ||||
-rw-r--r-- | libguile/init.c | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 10ac5c622..6efe5d9a4 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +2001-03-29 Keisuke Nishida <kxn30@po.cwru.edu> + + * goops.c, goops.h (scm_init_oop_goops_goopscore_module): Deprecated. + * init.c (scm_init_guile_1): Don't init goopscore module. + 2001-03-27 Marius Vollmer <mvo@zagadka.ping.de> * eval.c (SCM_APPLY): Check that arg1 is bound for scm_tc7_cxr. diff --git a/libguile/goops.c b/libguile/goops.c index f63a4a42f..beddf7dc9 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -2694,12 +2694,16 @@ scm_init_goops (void) scm_set_current_module (old_module); } +#if (SCM_DEBUG_DEPRECATED == 0) + void scm_init_oop_goops_goopscore_module () { scm_register_module_xxx ("oop goops goopscore", (void *) scm_init_goops); } +#endif /* (SCM_DEBUG_DEPRECATED == 0) */ + /* Local Variables: c-file-style: "gnu" diff --git a/libguile/goops.h b/libguile/goops.h index 624ca3075..c7de43bf4 100644 --- a/libguile/goops.h +++ b/libguile/goops.h @@ -237,7 +237,9 @@ SCM scm_m_atdispatch (SCM xorig, SCM env); #ifdef GUILE_DEBUG SCM scm_pure_generic_p (SCM obj); #endif +#if (SCM_DEBUG_DEPRECATED == 0) extern void scm_init_oop_goops_goopscore_module (void); +#endif /* (SCM_DEBUG_DEPRECATED == 0) */ SCM scm_sys_compute_slots (SCM c); SCM scm_i_get_keyword (SCM key, SCM l, int len, SCM default_value, const char *subr); diff --git a/libguile/init.c b/libguile/init.c index 8d3ca5f28..92ac9eaea 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -79,7 +79,6 @@ #include "libguile/fports.h" #include "libguile/gc.h" #include "libguile/gdbint.h" -#include "libguile/goops.h" #include "libguile/gsubr.h" #include "libguile/hash.h" #include "libguile/hashtab.h" @@ -575,8 +574,6 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_lang (); scm_init_script (); - scm_init_oop_goops_goopscore_module (); - scm_initialized_p = 1; scm_block_gc = 0; /* permit the gc to run */ |