Changeset 7715994 in mainline for uspace/srv/net/include/in.h

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:

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

uspace/srv/net/include/in.h

@@ -45 +45 @@
 /** INET string address maximum length.
  */
-#define INET_ADDRSTRLEN         ( 4 * 3 + 3 + 1 )
+#define INET_ADDRSTRLEN         (4 * 3 + 3 + 1)
 
 /** Type definition of the INET address.
@@ -62 +62 @@
         /** 4 byte IP address.
          */
-        uint32_t                s_addr;
+        uint32_t s_addr;
 };
 
@@ -72 +72 @@
          *  Should be AF_INET.
          */
-        uint16_t                sin_family;
+        uint16_t sin_family;
         /** Port number.
          */
-        uint16_t                sin_port;
+        uint16_t sin_port;
         /** Internet address.
          */
-        struct in_addr  sin_addr;
+        struct in_addr sin_addr;
         /** Padding to meet the sockaddr size.
          */
-        uint8_t                 sin_zero[ 8 ];
+        uint8_t sin_zero[8];
 };