Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 5863a95 in mainline for uspace/srv/clip/clip.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/clip/clip.c

    r70e5ad5 r5863a95  
    118118                }
    119119               
    120                 ipcarg_t retval = async_data_read_finalize(callid, clip_data, size);
     120                sysarg_t retval = async_data_read_finalize(callid, clip_data, size);
    121121                if (retval != EOK) {
    122122                        ipc_answer_0(rid, retval);
     
    145145       
    146146        fibril_mutex_unlock(&clip_mtx);
    147         ipc_answer_2(rid, EOK, (ipcarg_t) size, (ipcarg_t) tag);
     147        ipc_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag);
    148148}
    149149
     
    158158                ipc_callid_t callid = async_get_call(&call);
    159159               
    160                 switch (IPC_GET_METHOD(call)) {
     160                switch (IPC_GET_IMETHOD(call)) {
    161161                case IPC_M_PHONE_HUNGUP:
    162162                        cont = false;
     
    183183        async_set_client_connection(clip_connection);
    184184       
    185         ipcarg_t phonead;
     185        sysarg_t phonead;
    186186        if (ipc_connect_to_me(PHONE_NS, SERVICE_CLIPBOARD, 0, 0, &phonead) != 0)
    187187                return -1;
Note: See TracChangeset for help on using the changeset viewer.