Ethereal-dev: Re: [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.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Guy Harris <gharris@xxxxxxxxx>
Date: Mon, 14 Oct 2002 22:39:01 -0700
On Mon, Oct 14, 2002 at 03:47:58PM -0400, Jason House wrote:
> Here is a patch for wtap-int.h against the version from last night's
> tar-ball (10/14).

Checked in.

> the problem:   zlib.h includes winsock.h

Wonderful.  At least we can include winsock2.h before including
winsock.h, so we're not *completely* screwed.

> 34a35,37
> > #ifdef HAVE_WINSOCK2_H
> > #include <winsock2.h>
> > #endif

A "diff -c" or "diff -u" patch is better, as that means the patch can be
more easily applied if the file being patched has changed since the
patch was made.