Changeset 738


Ignore:
Timestamp:
04/25/06 20:11:08 (7 years ago)
Author:
perry
Message:

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

Location:
trunk/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/dagformat.h

    r708 r738  
    1010#define TYPE_ATM          3 
    1111#define TYPE_AAL5         4 
     12 
     13#ifdef WIN32 
     14#pragma pack(push) 
     15#pragma pack(1) 
     16#endif 
    1217 
    1318/** GPP Type 1 */ 
    … …  
    4146/** Flags */ 
    4247typedef struct flags { 
    43         unsigned int   iface:2; 
    44         unsigned int   vlen:1; 
    45         unsigned int   trunc:1; 
    46         unsigned int   rxerror:1; 
    47         unsigned int   dserror:1; 
    48         unsigned int   pad:2; 
     48        uint8_t   iface:2; 
     49        uint8_t   vlen:1; 
     50        uint8_t   trunc:1; 
     51        uint8_t   rxerror:1; 
     52        uint8_t   dserror:1; 
     53        uint8_t  pad:2; 
    4954} PACKED flags_t; 
    5055 
    … …  
    8994} duck_inf; 
    9095 
     96#ifdef WIN32 
     97#pragma pack(pop) 
     98#endif 
     99 
    91100/** sizeof(dag_record_t) without the payload helpers */ 
    92101#define dag_record_size         16 

  • trunk/lib/libtrace.h

    r735 r738  
    118118#  define SIMPLE_FUNCTION 
    119119#  define UNUSED 
    120 #  define PACKED 
     120#  define PACKED __declspec(align(1)) 
    121121#  define CONSTRUCTOR 
    122122#endif 
Note: See TracChangeset for help on using the changeset viewer.