Ethereal-dev: Re: [Ethereal-dev] 0.10.12 portability patch for Solaris, IRIX

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: Joerg Mayer <jmayer@xxxxxxxxx>
Date: Thu, 4 Aug 2005 22:30:53 +0200
On Thu, Aug 04, 2005 at 02:24:30PM -0500, Albert Chin wrote:
> The attached patch fixes this.

Content-Description: Patch
> --- epan/ftypes/ftype-tvbuff.c.orig	Tue Jul 26 14:26:02 2005
> +++ epan/ftypes/ftype-tvbuff.c	Thu Aug  4 12:24:08 2005

> -#include <epan/gdebug.h>

> --- epan/dfilter/gencode.c.orig	Tue Jul 26 14:26:02 2005
> +++ epan/dfilter/gencode.c	Thu Aug  4 12:24:08 2005

> -#include <epan/gdebug.h>

I don't think that this is the proper solution:  There is a reason
why we use our own gdebug.h (at least that's what I hope).
Just using the glib gdebug.h is not a solution. Maybe we shouldn't
redefine gdebug but use a different name instead?

> --- epan/proto.h.orig	Tue Jul 26 14:26:46 2005
> +++ epan/proto.h	Thu Aug  4 12:24:08 2005

>  #define DISSECTOR_ASSERT(expression)  \
> -  ((void) ((expression) ? 0 : \
> -   __DISSECTOR_ASSERT (expression, __FILE__, __LINE__)))
> +  ((expression) ? (void) 0 : \
> +   __DISSECTOR_ASSERT (expression, __FILE__, __LINE__))

This should already be fixed in cvs. The current code looks like this:

#define DISSECTOR_ASSERT(expression)  \
  ((void) ((expression) ? (void)0 : \
   __DISSECTOR_ASSERT (expression, __FILE__, __LINE__)))

 Ciao
     Joerg
-- 
Joerg Mayer                                           <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.