diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-01-02 19:56:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-01-02 19:56:59 +0000 |
| commit | 3d0d45cac5b500a2c19c05a469724c27eef487f9 (patch) | |
| tree | 9b0f0c6b2d621e6a2df6ab232fe2d358b5d667d6 | |
| parent | 9face6ceb82d838dee48dc8c172fcf9ce73301f1 (diff) | |
| download | wireshark-3d0d45cac5b500a2c19c05a469724c27eef487f9.tar.gz | |
From Gisle Vanem:
Here are some patches needed to build using HAVE_AIRPCAP
on MingW:
* airpcap.h needs 'WEP_KEY_MAX_SIZE' from <epan/crypt/wep-wpadefs.h>.
* airpcap_loader.h needs <epan/crypt/airpdcap_user.h> and definition of
'decryption_key_t'.
* epan/crypt/airpdcap_interop.h defines 'ntohs()' before <winsock2.h>
gets included. Thus creating a parse error later on.
svn path=/trunk/; revision=20274
| -rw-r--r-- | airpcap.h | 2 | ||||
| -rw-r--r-- | airpcap_loader.h | 2 | ||||
| -rw-r--r-- | epan/crypt/airpdcap_interop.h | 7 |
3 files changed, 10 insertions, 1 deletions
@@ -22,6 +22,8 @@ #if !defined(AIRPCAP_H__EAE405F5_0171_9592_B3C2_C19EC426AD34__INCLUDED_) #define AIRPCAP_H__EAE405F5_0171_9592_B3C2_C19EC426AD34__INCLUDED_ +#include <epan/crypt/wep-wpadefs.h> /* WEP_KEY_MAX_SIZE */ + /* This disables a VS warning for zero-sized arrays. All the compilers we support have that feature */ #pragma warning( disable : 4200) diff --git a/airpcap_loader.h b/airpcap_loader.h index 84766c90e3..d81132193d 100644 --- a/airpcap_loader.h +++ b/airpcap_loader.h @@ -28,6 +28,8 @@ #ifndef __AIRPCAP_LOADER_H__ #define __AIRPCAP_LOADER_H__ +#include <epan/crypt/airpdcap_user.h> + /* Error values from "get_airpcap_interface_list()". */ #define CANT_GET_AIRPCAP_INTERFACE_LIST 0 /* error getting list */ #define NO_AIRPCAP_INTERFACES_FOUND 1 /* list is empty */ diff --git a/epan/crypt/airpdcap_interop.h b/epan/crypt/airpdcap_interop.h index e398bf21bf..3c26163a5f 100644 --- a/epan/crypt/airpdcap_interop.h +++ b/epan/crypt/airpdcap_interop.h @@ -2,7 +2,7 @@ #define _AIRPDCAP_INTEROP_H /** - * Cast data types commonly used in Windows (e.g. UINT16) to theirf + * Cast data types commonly used (e.g. UINT16) to their * GLib equivalents. */ @@ -57,7 +57,12 @@ typedef guchar UCHAR; typedef gsize size_t; #endif +#ifdef WIN32 +#include <winsock2.h> /* ntohs() */ +#endif + #ifndef ntohs +#undef ntohs #define ntohs(value) g_ntohs(value) #endif |