[Patch] libguile/goops.c changes of 2000-11-24 broken

[Matthias Köppe]

Even a single (use-modules (oop goops)) would fail!

2000-11-24  Matthias Koeppe  <address@hidden>

        * goops.c, goops.h:  Fix previous change.

Index: libguile/goops.c
===================================================================
RCS file: /cvs/guile/guile-core/libguile/goops.c,v
retrieving revision 1.5
diff -u -r1.5 goops.c
--- libguile/goops.c    2000/11/24 10:55:23     1.5
+++ libguile/goops.c    2000/11/24 14:24:37
@@ -259,7 +259,7 @@
                    "bad slot name ~S",
                    SCM_LIST1 (tmp));
   
-  if (SCM_NULLP (scm_memq (tmp, slots_already_seen))) {
+  if (SCM_FALSEP (scm_memq (tmp, slots_already_seen))) {
     res               = scm_cons (SCM_CAR (l), res);
     slots_already_seen = scm_cons (tmp, slots_already_seen);
   }
Index: libguile/goops.h
===================================================================
RCS file: /cvs/guile/guile-core/libguile/goops.h,v
retrieving revision 1.3
diff -u -r1.3 goops.h
--- libguile/goops.h    2000/11/24 10:55:23     1.3
+++ libguile/goops.h    2000/11/24 14:24:37
@@ -134,7 +134,7 @@
                                   | SCM_CLASSF_SIMPLE_METHOD))
 
 #define SCM_SLOT(x, i)         (SCM_INST(x)[i])
-#define SCM_SUBCLASSP(c1, c2)  SCM_NNULLP (scm_memq (c2, SCM_SLOT (c1, 
scm_si_cpl)))
+#define SCM_SUBCLASSP(c1, c2)  SCM_NFALSEP (scm_memq (c2, SCM_SLOT (c1, 
scm_si_cpl)))
 #define SCM_IS_A_P(x, c)       (SCM_NIMP (x) \
                                && SCM_INSTANCEP (x) \
                                && SCM_SUBCLASSP (SCM_CLASS_OF (x), c))

-- 
Matthias Köppe -- http://www.math.uni-magdeburg.de/~mkoeppe