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

Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/arch/uspace/srv/ns/service.adl

    r37f7cfe ra9b6bec  
    22                /* Establish connection with the service
    33                   (this call is forwarded from Naming Service or Device Mapper) */
    4                 ipcarg_t ipc_m_connect_me_to(void);
     4                sysarg_t ipc_m_connect_me_to(void);
    55               
    66                /* Close connection */
    7                 ipcarg_t ipc_m_phone_hungup(void);
     7                sysarg_t ipc_m_phone_hungup(void);
    88};
Note: See TracChangeset for help on using the changeset viewer.