Ethereal-dev: Re: [Ethereal-dev] 0.10.5 Patch for Tru64 UNIX 4.0D/5.1

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

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Guy Harris <gharris@xxxxxxxxx>
Date: Fri, 6 Aug 2004 13:00:31 -0700
On Tue, Aug 03, 2004 at 12:04:54PM -0500, Albert Chin wrote:
> The patch below implements #2. I haven't included the patches that
> rename epan/resolv.[ch] -> epan/inet_resolv.[ch].

Checked in, but with "addr_resolv.{c,h}" rather than "inet_resolv.{c,h}"
(as it does more than just IPv4/IPv6 stuff), and...

> --- epan/Makefile.am.orig	2004-06-26 11:04:52.000000000 -0500
> +++ epan/Makefile.am	2004-08-03 10:29:47.000000000 -0500
> @@ -35,6 +35,7 @@
>  include Makefile.common
>  
>  INCLUDES = -I$(srcdir)/..
> +DEFS = @DEFS@ -DDATAFILE_DIR=\"$(datadir)\"

...without that change, as it caused duplicate definitions of
DATAFILE_DIR (in the "-D" flag and in config.h).