Ignore:
Timestamp:
2010-11-20T22:30:36Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb59f787
Parents:
1b22bd4 (diff), 7e1f9b7 (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/lib/net/include/net_interface.h

    r1b22bd4 r32eceb4f  
    4444/*@{*/
    4545
    46 extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *,
     46extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
    4747    size_t, char **);
    48 extern int net_get_conf_req(int, measured_string_ref *, size_t, char **);
    49 extern void net_free_settings(measured_string_ref, char *);
     48extern int net_get_conf_req(int, measured_string_t **, size_t, char **);
     49extern void net_free_settings(measured_string_t *, char *);
    5050extern int net_connect_module(void);
    5151
Note: See TracChangeset for help on using the changeset viewer.