Changeset ea186c6 in mainline for uspace/srv/loc/loc.h

Timestamp:

2011-08-18T20:27:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

921b84f

Parents:

1f44b056 (diff), ef7052ec (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/loc/loc.h (modified) (2 diffs)

uspace/srv/loc/loc.h

@@ -89 +89 @@
         /** Link to list of services in category (category_t.services) */
         link_t cat_services;
+        /** List of category memberships (svc_categ_t) */
+        list_t cat_memb;
         /** Unique service identifier */
         service_id_t id;
@@ -101 +103 @@
 } loc_service_t;
 
+extern fibril_mutex_t services_list_mutex;
+
 extern service_id_t loc_create_id(void);
 extern void loc_category_change_event(void);