Ignore:
Timestamp:
2010-12-25T21:20:28Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (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/socket_core.h

    r1bfd3d3 r973ef9fc  
    117117extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
    118118    void (*)(socket_core_t *));
    119 extern int socket_reply_packets(packet_t, size_t *);
     119extern int socket_reply_packets(packet_t *, size_t *);
    120120extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *,
    121121    size_t);
Note: See TracChangeset for help on using the changeset viewer.