guile/guile-core/libguile ChangeLog goops.c init.c

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:             01/04/10 19:09:35

Modified files:
        guile-core/libguile: ChangeLog goops.c init.c 

Log message:
        * init.c, goops.c: Reverted change of 2001-03-29.  (The goops
        module should be registered in order to work for an application
        which uses libguile statically linked.)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?tr1=1.1348&tr2=1.1349r1=text&r2=text
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/goops.c.diff?tr1=1.26&tr2=1.27r1=text&r2=text
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/init.c.diff?tr1=1.115&tr2=1.116r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1348 
guile/guile-core/libguile/ChangeLog:1.1349
--- guile/guile-core/libguile/ChangeLog:1.1348  Tue Apr 10 00:57:04 2001
+++ guile/guile-core/libguile/ChangeLog Tue Apr 10 19:09:34 2001
@@ -1,3 +1,9 @@
+2001-04-10  Mikael Djurfeldt  <address@hidden>
+
+       * init.c, goops.c: Reverted change of 2001-03-29.  (The goops
+       module should be registered in order to work for an application
+       which uses libguile statically linked.)
+
 2001-04-10  Dirk Herrmann  <address@hidden>
 
        * numbers.[ch] (scm_num2long, scm_num2long_long,
Index: guile/guile-core/libguile/goops.c
diff -u guile/guile-core/libguile/goops.c:1.26 
guile/guile-core/libguile/goops.c:1.27
--- guile/guile-core/libguile/goops.c:1.26      Thu Mar 29 18:50:38 2001
+++ guile/guile-core/libguile/goops.c   Tue Apr 10 19:09:35 2001
@@ -2694,15 +2694,11 @@
   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:
Index: guile/guile-core/libguile/init.c
diff -u guile/guile-core/libguile/init.c:1.115 
guile/guile-core/libguile/init.c:1.116
--- guile/guile-core/libguile/init.c:1.115      Thu Mar 29 18:50:38 2001
+++ guile/guile-core/libguile/init.c    Tue Apr 10 19:09:35 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999, 2000, 2001 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
@@ -79,6 +79,7 @@
 #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"
@@ -573,6 +574,8 @@
   scm_init_dynamic_linking ();
   scm_init_lang ();
   scm_init_script ();
+
+  scm_init_oop_goops_goopscore_module ();
   
   scm_initialized_p = 1;