On Sat, Jun 22, 2002 at 12:19:59PM -0400, Mike Frisch wrote:
> On Sat, Jun 22, 2002 at 04:01:24AM -0700, Guy Harris wrote:
> > However, I don't have a standard version of WinPcap installed, so it may
> > be that some WinPcap header file in the version you have installed is
> > dragging in <winsock2.h>, and that's conflicting with <winsock.h> as
> > included by other header files in Wiretap.
>
> I am using the "Developer's pack" at
>
> http://winpcap.polito.it/install/bin/WPdpack_2_3.zip
>
> Is there something different I should be using?
No. I thought I'd had a newer-than-2.3 version installed (as part of
working on merging WinPcap into the main libpcap CVS tree), but it
appears I had an old one.
Older WinPcap's (including the 2.3 beta) included <winsock.h>; 2.3
includes <winsock2.h>.
I've checked in changes to make Ethereal include <winsock2.h> rather
than <winsock.h> throughout; that appears to have allowed Ethereal to
compile with the WinPcap 2.3 developer's pack (although it may not allow
it to build with older versions; people doing Ethereal builds on Windows
should install the 2.3 developer's pack, and install the 2.3 binary if
they don't already have it installed).
We may be including <winsock2.h> more than we need to, though; we may
want to use GLib data types (guint, guchar, guint16, guint32, etc.)
instead of "u_char", "u_int", and so on, which might let us reduce the
number of includes of <winsock2.h> and possibly also the number of
includes of <sys/types.h>.