[Mesa-dev] [PATCH 1/7] gallium/u_math.h: don't redefine INFINITY and NAN in VS2013

[Brian Paul]

On 07/22/2014 03:07 PM, Alon Levy wrote:
> Under VS2013 compiler that is distinguished by _MSC_VER of 1800 those two
> are already defined, use the SDK definition.
>
> Another option would have been to undef and use the definitions here - I'm
> not sure which is better.
> ---
> This removes warnings, this patch is not actually required to build.
>
>   src/gallium/auxiliary/util/u_math.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
> index ec03e4e..60995d7 100644
> --- a/src/gallium/auxiliary/util/u_math.h
> +++ b/src/gallium/auxiliary/util/u_math.h
> @@ -136,10 +136,10 @@ roundf(float x)
>   {
>      return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f);
>   }
> -#endif
>
>   #define INFINITY (DBL_MAX + DBL_MAX)
>   #define NAN (INFINITY - INFINITY)
> +#endif
>
>   #endif /* _MSC_VER */
>
>

This does not apply to the master branch.  Neither does patch 3.

-Brian