diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-02 14:45:49 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-02 14:45:49 +0000 |
commit | 2f6ecaa3c9e41b1d42c7acff5c7fd054e387c8c9 (patch) | |
tree | b5a8dae6c74ef9b91df4176e243db852ecd66937 /airpcap.h | |
parent | 7afd9b0c3b6a16397291a64293d547b46f502669 (diff) |
Guard pragma pack in case we continue implementing the wireless toolbar for
all platforms.
svn path=/trunk/; revision=31409
Diffstat (limited to 'airpcap.h')
-rw-r--r-- | airpcap.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -92,11 +92,12 @@ typedef struct _AirpcapDeviceDescription #define WEP_KEY_MAX_SIZE 32 ///< Maximum size of a WEP key, in bytes. This is the size of an entry in the ///< AirpcapWepKeysCollection structure +#ifdef _WIN32 #ifndef __MINGW32__ #pragma pack(push) #pragma pack(1) #endif // __MINGW32__ - +#endif #define AIRPCAP_KEYTYPE_WEP 0 ///< Key type: WEP. The key can have an arbitrary length smaller than 32 bytes. #define AIRPCAP_KEYTYPE_TKIP 1 ///< Key type: TKIP (WPA). NOT SUPPORTED YET. @@ -211,9 +212,11 @@ AirpcapBpfHeader, *PAirpcapBpfHeader; #define AIRPCAP_ALIGNMENT sizeof(int) #define AIRPCAP_WORDALIGN(x) (((x)+(AIRPCAP_ALIGNMENT-1))&~(AIRPCAP_ALIGNMENT-1)) +#ifdef _WIN32 #ifndef __MINGW32__ #pragma pack(pop) #endif // __MINGW32__ +#endif #define AIRPCAP_ERRBUF_SIZE 512 ///< Size of the error buffer, in bytes |