Changeset f1fae414 in mainline for uspace/lib/net/nil/nil_skel.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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:

• uspace/lib/net/nil/nil_skel.c (modified) (2 diffs)

uspace/lib/net/nil/nil_skel.c

@@ -51 +51 @@
  *
  */
-static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         /*
@@ -117 +118 @@
                 goto out;
         
-        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
+        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
         if (rc != EOK)
                 goto out;