Changeset 2b96463 in mainline for uspace/srv/loader/main.c

Timestamp:

2011-01-28T15:15:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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/srv/loader/main.c (modified) (2 diffs)

uspace/srv/loader/main.c

@@ -423 +423 @@
 int main(int argc, char *argv[])
 {
-        sysarg_t phonead;
         task_id_t id;
         int rc;
@@ -439 +438 @@
         
         /* Register at naming service. */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0) 
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, NULL, NULL) != 0)
                 return -2;