Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 520acaf in mainline for uspace/srv/locsrv/locsrv.h


Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/locsrv/locsrv.h

    r11b9ad7 r520acaf  
    8686        /** Link to global list of services (services_list) */
    8787        link_t services;
     88       
    8889        /** Link to server list of services (loc_server_t.services) */
    8990        link_t server_services;
     91       
    9092        /** Link to list of services in category (category_t.services) */
    9193        link_t cat_services;
     94       
    9295        /** List of category memberships (svc_categ_t) */
    9396        list_t cat_memb;
     97       
    9498        /** Unique service identifier */
    9599        service_id_t id;
     100       
    96101        /** Service namespace */
    97102        loc_namespace_t *namespace;
     103       
    98104        /** Service name */
    99105        char *name;
     106       
    100107        /** Supplier of this service */
    101108        loc_server_t *server;
     109       
    102110        /** Use this interface when forwarding to server. */
    103111        sysarg_t forward_interface;
Note: See TracChangeset for help on using the changeset viewer.