Ethereal-dev: [Ethereal-dev] [patch] wiretap compilation issue for win32 with zlib

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Jason House <jhouse@xxxxxxxxx>
Date: Mon, 14 Oct 2002 15:47:58 -0400
Here is a patch for wtap-int.h against the version from last night's
tar-ball (10/14).

the problem:   zlib.h includes winsock.h before winsock2.h is included
elsewhere.  Under windows, they can NOT be included in that order
without compilation errors.  winsock2.h must come first.  The patch
includes winsock2.h only if winsock2.h exists and zlib is included in
the build.
34a35,37
> #ifdef HAVE_WINSOCK2_H
> #include <winsock2.h>
> #endif