VirtualBox

Changeset 11546

Show
Ignore:
Timestamp:
08/21/08 18:36:50 (3 months ago)
Author:
vboxsync
Message:

attempt to fix the Windows builds

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/iprt/net.h

    r11538 r11546  
    7474    RTMAC Node; 
    7575} RTNETADDRIPX; 
    76 #pragma pack(0) 
     76#pragma pack() 
    7777AssertCompileSize(RTNETADDRIPX, 4+6); 
    7878/** Pointer to an IPX address. */ 
    …… 
    180180    uint32_t        ip_options[1]; 
    181181} RTNETIPV4; 
    182 #pragma pack(0) 
     182#pragma pack() 
    183183AssertCompileSize(RTNETIPV4, 6 * 4); 
    184184/** Pointer to a IPv4 header. */ 
    …… 
    234234    uint16_t    uh_sum; 
    235235} RTNETUDP; 
    236 #pragma pack(0) 
     236#pragma pack() 
    237237AssertCompileSize(RTNETUDP, 8); 
    238238/** Pointer to an UDP header. */ 
    …… 
    302302 
    303303} RTNETBOOTP; 
    304 #pragma pack(0) 
     304#pragma pack() 
    305305AssertCompileSize(RTNETBOOTP, 0xec + 128); 
    306306/** Pointer to a BOOTP / DHCP packet. */ 
    …… 
    406406    uint8_t         abOptions[57]; 
    407407} RTNETDHCP; 
    408 #pragma pack(0) 
     408#pragma pack() 
    409409/** @todo AssertCompileSize(RTNETDHCP, ); */ 
    410410/** Pointer to a DHCP packet. */ 
    …… 
    449449    /* (options follows here and then the data (aka text).) */ 
    450450} RTNETTCP; 
    451 #pragma pack(0) 
     451#pragma pack() 
    452452AssertCompileSize(RTNETTCP, 20); 
    453453/** Pointer to a TCP packet. */ 
    …… 
    478478    uint16_t        icmp_cksum; 
    479479} RTNETICMPV4HDR; 
    480 #pragma pack(0) 
     480#pragma pack() 
    481481AssertCompileSize(RTNETICMPV4HDR, 4); 
    482482/** Pointer to an ICMP packet header. */ 
    …… 
    509509    uint8_t         icmp_data[1]; 
    510510} RTNETICMPV4ECHO; 
    511 #pragma pack(0) 
     511#pragma pack() 
    512512AssertCompileSize(RTNETICMPV4ECHO, 9); 
    513513/** Pointer to an ICMP ECHO packet. */ 
    …… 
    538538    uint32_t        icmp_mtu; 
    539539} RTNETICMPV4TRACEROUTE; 
    540 #pragma pack(0) 
     540#pragma pack() 
    541541AssertCompileSize(RTNETICMPV4TRACEROUTE, 20); 
    542542/** Pointer to an ICMP TRACEROUTE packet. */ 
    …… 
    582582    uint16_t    ar_oper; 
    583583} RTNETARPHDR; 
    584 #pragma pack(0) 
     584#pragma pack() 
    585585AssertCompileSize(RTNETARPHDR, 8); 
    586586/** Pointer to an ethernet ARP header. */ 
    …… 
    624624    RTNETADDRIPV4   ar_tpa; 
    625625} RTNETARPIPV4; 
    626 #pragma pack(0) 
     626#pragma pack() 
    627627AssertCompileSize(RTNETARPIPV4, 8+6+4+6+4); 
    628628/** Pointer to an ethernet IPv4+MAC ARP request packet. */ 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy