Changeset 7adcf03 in rtems

Timestamp:

05/24/05 04:24:59 (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

23bf0865

Parents:

5d25da9

Message:

Remove BYTE_PACK.
Add packed.
Partial update from FreeBSD.

File:

• cpukit/libnetworking/netinet/ip.h (modified) (4 diffs)

cpukit/libnetworking/netinet/ip.h

@@ -38 +38 @@
 #define _NETINET_IP_H_
 
+#include <sys/cdefs.h>
+
 /*
  * Definitions for internet protocol version 4.
@@ -44 +46 @@
 #define IPVERSION       4
 
-#ifndef BYTE_PACK
-#define BYTE_PACK __attribute__((packed))
+#ifndef __packed
+#if defined(__GNUC__)
+#define __packed __attribute__((packed))
+#else
+#define __packed
+#endif
 #endif
 
@@ -65 +71 @@
 #endif /* not _IP_VHL */
         u_char  ip_tos;                 /* type of service */
-        u_short ip_len BYTE_PACK;       /* total length */
-        u_short ip_id BYTE_PACK;        /* identification */
-        u_short ip_off BYTE_PACK;       /* fragment offset field */
+        u_short ip_len;                 /* total length */
+        u_short ip_id;                  /* identification */
+        u_short ip_off;                 /* fragment offset field */
 #define IP_RF 0x8000                    /* reserved fragment flag */
 #define IP_DF 0x4000                    /* dont fragment flag */
@@ -74 +80 @@
         u_char  ip_ttl;                 /* time to live */
         u_char  ip_p;                   /* protocol */
-        u_short ip_sum BYTE_PACK;                       /* checksum */
-        struct  in_addr ip_src BYTE_PACK; /* source address */
-        struct  in_addr ip_dst BYTE_PACK; /* dest address */
-};
+        u_short ip_sum;                 /* checksum */
+        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+} __packed;
 
 #ifdef _IP_VHL