Changeset 0c1a5d8a in mainline for kernel/generic/src/ipc/sysipc.c


Ignore:
Timestamp:
2007-01-29T18:07:28Z (18 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b1349e0
Parents:
c27c988
Message:

avoid conflict with potential keyword

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ipc/sysipc.c

    rc27c988 r0c1a5d8a  
    195195                IPC_SET_ARG3(call->data, (unative_t)&TASK->phones[newphid]);
    196196                call->flags |= IPC_CALL_CONN_ME_TO;
    197                 call->private = newphid;
     197                call->priv = newphid;
    198198                break;
    199199        case IPC_M_AS_AREA_SEND:
     
    224224        if (call->flags & IPC_CALL_CONN_ME_TO) {
    225225                if (IPC_GET_RETVAL(call->data))
    226                         phone_dealloc(call->private);
     226                        phone_dealloc(call->priv);
    227227                else
    228                         IPC_SET_ARG3(call->data, call->private);
     228                        IPC_SET_ARG3(call->data, call->priv);
    229229        }
    230230}
     
    528528
    529529                /* Set in_phone_hash to the interrupt counter */
    530                 call->data.phone = (void *)call->private;
     530                call->data.phone = (void *) call->priv;
    531531               
    532532                STRUCT_TO_USPACE(calldata, &call->data);
Note: See TracChangeset for help on using the changeset viewer.