Changeset 11698


Ignore:
Timestamp:
Feb 8, 2009, 12:09:52 PM (11 years ago)
Author:
rme
Message:

Really merge r11694 from trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.3/source/lisp-kernel/gc-common.c

    r11675 r11698  
    667667  struct xmacptr *x, *xnext;
    668668  int i, flags;
    669   xmacptr_dispose_fn fn;
     669  xmacptr_dispose_fn dfn;
    670670
    671671  for (p = postGCptrs; p; p = next) {
     
    678678    xnext = (xmacptr *) (x->class);;
    679679    flags = x->flags - xmacptr_flag_user_first;
    680     fn = xmacptr_dispose_functions[flags];
     680    dfn = xmacptr_dispose_functions[flags];
    681681    addr = (void *) x->address;
    682682    x->address = 0;
     
    684684    x->link = 0;
    685685    x->class = 0;
    686     if (fn && addr) {
    687       fn(addr);
     686    if (dfn && addr) {
     687      dfn(addr);
    688688    }
    689689  }
     
    693693
    694694int
    695 register_xmacptr_dispose_function(void *fn)
     695register_xmacptr_dispose_function(void *dfn)
    696696{
    697697  int i, k;
     
    699699  for( i = 0, k = xmacptr_flag_user_first; k < xmacptr_flag_user_last; i++, k++) {
    700700    if (xmacptr_dispose_functions[i]==NULL) {
    701       xmacptr_dispose_functions[i] = fn;
     701      xmacptr_dispose_functions[i] = dfn;
    702702      return k;
    703703    }
    704     if (xmacptr_dispose_functions[i] == fn) {
     704    if (xmacptr_dispose_functions[i] == dfn) {
    705705      return k;
    706706    }
Note: See TracChangeset for help on using the changeset viewer.