Changeset bf66333 for lib

Timestamp:

04/25/06 20:11:08 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

7fc01569

Parents:

030aa3f

Message:

Undo some of the ISO Cification due to the way VS deals with packed bitfield
types.

Location:

lib

Files:

• dagformat.h (modified) (3 diffs)
• libtrace.h (modified) (1 diff)

lib/dagformat.h

@@ -10 +10 @@
 #define TYPE_ATM          3
 #define TYPE_AAL5         4
+
+#ifdef WIN32
+#pragma pack(push)
+#pragma pack(1)
+#endif
 
 /** GPP Type 1 */
@@ -41 +46 @@
 /** Flags */
 typedef struct flags {
-        unsigned int   iface:2;
-        unsigned int   vlen:1;
-        unsigned int   trunc:1;
-        unsigned int   rxerror:1;
-        unsigned int   dserror:1;
-        unsigned int   pad:2;
+        uint8_t   iface:2;
+        uint8_t   vlen:1;
+        uint8_t   trunc:1;
+        uint8_t   rxerror:1;
+        uint8_t   dserror:1;
+        uint8_t  pad:2;
 } PACKED flags_t;
 
@@ -89 +94 @@
 } duck_inf;
 
+#ifdef WIN32
+#pragma pack(pop)
+#endif
+
 /** sizeof(dag_record_t) without the payload helpers */
 #define dag_record_size         16

lib/libtrace.h

@@ -118 +118 @@
 #  define SIMPLE_FUNCTION
 #  define UNUSED
-#  define PACKED
+#  define PACKED __declspec(align(1))
 #  define CONSTRUCTOR
 #endif