Changeset 6843a9c in mainline for uspace/lib/c/include/loc.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/include/loc.h (modified) (2 diffs)

uspace/lib/c/include/loc.h

@@ -46 +46 @@
 extern void loc_exchange_end(async_exch_t *);
 
-extern int loc_server_register(const char *, async_client_conn_t);
+extern int loc_server_register(const char *);
 extern int loc_service_register(const char *, service_id_t *);
 extern int loc_service_register_with_iface(const char *, service_id_t *,
@@ -56 +56 @@
     unsigned int);
 extern int loc_service_get_name(service_id_t, char **);
+extern int loc_service_get_server_name(service_id_t, char **);
 extern int loc_namespace_get_id(const char *, service_id_t *,
     unsigned int);