Attachment 94935 Details for Bug 75336 – patch for u_math.h

[patch] patch for u_math.h

0001-util-don-t-define-isfinite-isnan-for-MSVC-1800.patch (text/plain), 1.13 KB, created by Brian Paul on 2014-03-01 18:32:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2014-03-01 18:32:10 UTC

Size: 1.13 KB

patch

obsolete

>From b32f9cba70e38a2db190d2803a349b96756b8baa Mon Sep 17 00:00:00 2001
>From: Hans <hans@chromium.org>
>Date: Sat, 1 Mar 2014 11:26:09 -0700
>Subject: [PATCH 1/2] util: don't define isfinite(), isnan() for MSVC >= 1800
>
>Signed-off-by: Brian Paul <brianp@vmware.com>
>---
> src/gallium/auxiliary/util/u_math.h |    4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
>index ffbcc4c..ec03e4e 100644
>--- a/src/gallium/auxiliary/util/u_math.h
>+++ b/src/gallium/auxiliary/util/u_math.h
>@@ -112,10 +112,13 @@ static INLINE float logf( float f )
> #define logf(x) ((float)log((double)(x)))
> #endif /* logf */
> 
>+#if _MSC_VER < 1800
> #define isfinite(x) _finite((double)(x))
> #define isnan(x) _isnan((double)(x))
>+#endif /* _MSC_VER < 1800 */
> #endif /* _MSC_VER < 1400 && !defined(__cplusplus) */
> 
>+#if _MSC_VER < 1800
> static INLINE double log2( double x )
> {
>    const double invln2 = 1.442695041;
>@@ -133,6 +136,7 @@ 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)
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 75336: 94935 | 94936

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.