Changeset 858fc90 in mainline for uspace/srv/net/include/in6.h

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 from bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/include/in6.h (modified) (3 diffs)

uspace/srv/net/include/in6.h

@@ -45 +45 @@
 /** INET6 string address maximum length.
  */
-#define INET6_ADDRSTRLEN        ( 8 * 4 + 7 + 1 )
+#define INET6_ADDRSTRLEN        (8 * 4 + 7 + 1)
 
 /** Type definition of the INET6 address.
@@ -62 +62 @@
         /** 16 byte IPv6 address.
          */
-        unsigned char   s6_addr[ 16 ];
+        unsigned char s6_addr[16];
 };
 
@@ -72 +72 @@
          *  Should be AF_INET6.
          */
-        uint16_t                sin6_family;
+        uint16_t sin6_family;
         /** Port number.
          */
-        uint16_t                sin6_port;
+        uint16_t sin6_port;
         /** IPv6 flow information.
          */
-        uint32_t                sin6_flowinfo;
+        uint32_t sin6_flowinfo;
         /** IPv6 address.
          */
-        struct in6_addr sin6_addr;
+        struct in6_addr sin6_addr;
         /** Scope identifier.
          */
-        uint32_t                sin6_scope_id;
+        uint32_t sin6_scope_id;
 };