Re: xulrunner192 fails build

[maya%netbsd.org@localhost]

On Fri, Aug 04, 2017 at 09:29:34AM +0000, Chavdar Ivanov wrote:
> Using NetBSD-current as of today, amd64, xulrunner192 fails compilation
> with multiple redefines. The following solved it for me:

Thanks, I committed it.
I modified:

> +#if 0
>  #if defined(__cplusplus)
>  #define        __BEGIN_DECLS   extern "C" {
>  #define        __END_DECLS     }

I checked if __BEGIN_DECLS already exists, as some operating systems may
not have it.

>  #if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 5
>  #define        __attribute__(x)        /* delete __attribute__ if non-gcc
> or gcc1 */
> -#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
> +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && 0
>  #define        __dead          __volatile
>  #define        __pure          __const
>  #endif

I changed the version check to one that doesn't spuriously match modern
GCC:
#if !defined(__GNUC__) || (__GNUC__ < 2 && __GNUC_MINOR__ < 5)

Which achieves the same and was probably the original intention