Changeset 89ac5513 in mainline for uspace/lib/c/include/net/in.h

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/in.h (modified) (2 diffs)

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

@@ -47 +47 @@
 #define INADDR_ANY 0
 
-/** Type definition of the INET address.
- * @see in_addr
- */
-typedef struct in_addr in_addr_t;
-
-/** Type definition of the INET socket address.
- * @see sockaddr_in
- */
-typedef struct sockaddr_in      sockaddr_in_t;
-
 /** INET address. */
-struct in_addr {
+typedef struct in_addr {
         /** 4 byte IP address. */
         uint32_t s_addr;
-};
+} in_addr_t;
 
 /** INET socket address.
  * @see sockaddr
  */
-struct sockaddr_in {
+typedef struct sockaddr_in {
         /** Address family. Should be AF_INET. */
         uint16_t sin_family;
@@ -72 +62 @@
         uint16_t sin_port;
         /** Internet address. */
-        struct in_addr sin_addr;
+        in_addr_t sin_addr;
         /** Padding to meet the sockaddr size. */
         uint8_t sin_zero[8];
-};
+} sockaddr_in_t;
 
 #endif