Changeset dd0c8a0 in mainline for uspace/lib/c/include/net/inet.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/lib/c/include/net/inet.h (modified) (1 diff)

uspace/lib/c/include/net/inet.h

@@ -41 +41 @@
 #include <byteorder.h>
 
-/** Type definition of the socket address.
- * @see sockaddr
- */
-typedef struct sockaddr         sockaddr_t;
-
 /** Type definition of the address information.
  * @see addrinfo
  */
-typedef struct addrinfo         addrinfo_t;
+typedef struct addrinfo addrinfo_t;
 
 /** Socket address. */
-struct sockaddr {
+typedef struct sockaddr {
         /** Address family. @see socket.h */
         uint16_t sa_family;
         /** 14 byte protocol address. */
         uint8_t sa_data[14];
-};
+} sockaddr_t;
 
 extern int inet_ntop(uint16_t, const uint8_t *, char *, size_t);