Ignore:
Timestamp:
2010-03-13T12:17:02Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6ba20a6b
Parents:
d0febca (diff), 2070570 (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/net/include/socket_codes.h

    rd0febca r7715994  
    442442        /** Stream (connection oriented) socket.
    443443         */
    444         SOCK_STREAM     = 1,
     444        SOCK_STREAM = 1,
    445445        /** Datagram (connectionless oriented) socket.
    446446         */
    447         SOCK_DGRAM      = 2,
     447        SOCK_DGRAM = 2,
    448448        /** Raw socket.
    449449         */
    450         SOCK_RAW        = 3
     450        SOCK_RAW = 3
    451451} sock_type_t;
    452452
Note: See TracChangeset for help on using the changeset viewer.