Changeset 568dc0e

Timestamp:

08/11/04 16:04:51 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5c5b47b

Parents:

ac50951

Message:

changed test for endianness/ not sure if this is right yet?

File:

• lib/libtrace.h (modified) (3 diffs)

lib/libtrace.h

@@ -90 +90 @@
 struct libtrace_ip
   {
-#if BYTE_ORDER == __LITTLE_ENDIAN
+#if BYTE_ORDER == LITTLE_ENDIAN
     unsigned int ip_hl:4;               /**< header length */
     unsigned int ip_v:4;                /**< version */
-#endif
-#if BYTE_ORDER == __BIG_ENDIAN
+#elif BYTE_ORDER == BIG_ENDIAN
     unsigned int ip_v:4;                /**< version */
     unsigned int ip_hl:4;               /**< header length */
+#else
+#   error "Adjust your <bits/endian.h> defines"
 #endif
     u_int8_t ip_tos;                    /**< type of service */
@@ -119 +120 @@
     u_int32_t seq;              /**< Sequence number */
     u_int32_t ack_seq;          /**< Acknowledgement Number */
-#  if BYTE_ORDER == __LITTLE_ENDIAN
+#  if BYTE_ORDER == LITTLE_ENDIAN
     u_int16_t res1:4;           /**< Reserved bits */
     u_int16_t doff:4;           
@@ -129 +130 @@
     u_int16_t urg:1;            /**< URG flag */
     u_int16_t res2:2;           /**< Reserved */
-#  elif BYTE_ORDER == __BIG_ENDIAN
+#  elif BYTE_ORDER == BIG_ENDIAN
     u_int16_t doff:4;           
     u_int16_t res1:4;