Changeset 7bdcc45 in mainline for contrib/arch/uspace/srv/ns/service.adl

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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:

• contrib/arch/uspace/srv/ns/service.adl (modified) (1 diff)

contrib/arch/uspace/srv/ns/service.adl

@@ -2 +2 @@
                 /* Establish connection with the service
                    (this call is forwarded from Naming Service or Device Mapper) */
-                ipcarg_t ipc_m_connect_me_to(void);
+                sysarg_t ipc_m_connect_me_to(void);
                 
                 /* Close connection */
-                ipcarg_t ipc_m_phone_hungup(void);
+                sysarg_t ipc_m_phone_hungup(void);
 };