svn commit: r457632 - in head/lang/guile2: . files

[Alexey Dokuchaev]

On Sat, Dec 30, 2017 at 09:59:08PM +0100, Jan Beich wrote:
> Alexey Dokuchaev <danfe at 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