Changeset ea28272 in mainline for uspace/srv/ns/ns.c


Ignore:
Timestamp:
2010-12-30T13:43:27Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/ns/ns.c

    rd70d80ed rea28272  
    7878        }
    7979       
    80         ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
     80        ipc_answer_2(callid, EOK, (sysarg_t) *addr, AS_AREA_READ);
    8181}
    8282
    … …  
    135135               
    136136                task_id_t id;
    137                 ipcarg_t retval;
    138                
    139                 switch (IPC_GET_METHOD(call)) {
     137                sysarg_t retval;
     138               
     139                switch (IPC_GET_IMETHOD(call)) {
    140140                case IPC_M_SHARE_IN:
    141141                        switch (IPC_GET_ARG3(call)) {
Note: See TracChangeset for help on using the changeset viewer.