Changeset bc73be3 in mainline for kernel/generic/src/ipc/kbox.c


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/ipc/kbox.c

    rad40b74b rbc73be3  
    121121
    122122        LOG("Continue with hangup message.");
    123         IPC_SET_RETVAL(call->data, 0);
     123        ipc_set_retval(&call->data, 0);
    124124        ipc_answer(&TASK->kb.box, call);
    125125
    … …  
    174174                        continue;  /* Try again. */
    175175
    176                 switch (IPC_GET_IMETHOD(call->data)) {
     176                switch (ipc_get_imethod(&call->data)) {
    177177
    178178                case IPC_M_DEBUG:
Note: See TracChangeset for help on using the changeset viewer.