[Openmcl-cvs-notifications] r11698 - /release/1.3/source/lisp-kernel/gc-common.c

[rme at clozure.com]

Author: rme
Date: Sun Feb  8 07:09:52 2009
New Revision: 11698

Log:
Really merge r11694 from trunk.

Modified:
    release/1.3/source/lisp-kernel/gc-common.c

Modified: release/1.3/source/lisp-kernel/gc-common.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/lisp-kernel/gc-common.c (original)
+++ release/1.3/source/lisp-kernel/gc-common.c Sun Feb  8 07:09:52 2009
@@ -666,7 +666,7 @@
   void *p, *next, *addr;
   struct xmacptr *x, *xnext;
   int i, flags;
-  xmacptr_dispose_fn fn;
+  xmacptr_dispose_fn dfn;
 =

   for (p =3D postGCptrs; p; p =3D next) {
     next =3D *((void **)p);
@@ -677,14 +677,14 @@
   for (x =3D user_postGC_macptrs; x; x =3D xnext) {
     xnext =3D (xmacptr *) (x->class);;
     flags =3D x->flags - xmacptr_flag_user_first;
-    fn =3D xmacptr_dispose_functions[flags];
+    dfn =3D xmacptr_dispose_functions[flags];
     addr =3D (void *) x->address;
     x->address =3D 0;
     x->flags =3D 0;
     x->link =3D 0;
     x->class =3D 0;
-    if (fn && addr) {
-      fn(addr);
+    if (dfn && addr) {
+      dfn(addr);
     }
   }
 =

@@ -692,16 +692,16 @@
 }
 =

 int
-register_xmacptr_dispose_function(void *fn)
+register_xmacptr_dispose_function(void *dfn)
 {
   int i, k;
   =

   for( i =3D 0, k =3D xmacptr_flag_user_first; k < xmacptr_flag_user_last;=
 i++, k++) {
     if (xmacptr_dispose_functions[i]=3D=3DNULL) {
-      xmacptr_dispose_functions[i] =3D fn;
+      xmacptr_dispose_functions[i] =3D dfn;
       return k;
     }
-    if (xmacptr_dispose_functions[i] =3D=3D fn) {
+    if (xmacptr_dispose_functions[i] =3D=3D dfn) {
       return k;
     }
   }