From owner-svn-ports-all@freebsd.org  Sun Dec 31 08:40:29 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7F1CEAAB3A;
 Sun, 31 Dec 2017 08:40:29 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2610:1c1:1:6074::16:84])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9876A691DB;
 Sun, 31 Dec 2017 08:40:29 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
 id CC14D2287; Sun, 31 Dec 2017 08:40:28 +0000 (UTC)
Date: Sun, 31 Dec 2017 08:40:28 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Jan Beich <jbeich@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r457632 - in head/lang/guile2: . files
Message-ID: <20171231084028.GA98479@FreeBSD.org>
References: <201712301912.vBUJCdtc086342@repo.freebsd.org>
 <1sjc-ylsz-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1sjc-ylsz-wny@FreeBSD.org>
User-Agent: Mutt/1.9.2 (2017-12-15)
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Dec 2017 08:40:29 -0000

On Sat, Dec 30, 2017 at 09:59:08PM +0100, Jan Beich wrote:
> Alexey Dokuchaev <danfe@FreeBSD.org> writes:
> 
> > ++/* With old GCC, do not override _Static_assert: it conflicts with
> > ++   #include <complex.h> below. */
> > ++#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
> 
> - GCC check for minor version rejects 5.4, 6.4, 7.2
> - Clang check needs defined() to pacify -Wundef with GCC
> 
> libguile/numbers.c:50:5: warning: "__clang__" is not defined, evaluates
> to 0 [-Wundef]
>  #if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
>      ^~~~~~~~~

How about this:

    #if defined(__clang__) || (__GNUC__ * 10 + __GNUC_MINOR__ >= 46)
    ... ?

./danfe