diff options
| author | José Fonseca <jfonseca@vmware.com> | 2011-02-11 11:11:33 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-02-11 11:11:33 +0000 |
| commit | 151faa2258be40abbce017b65d95c52003053d2b (patch) | |
| tree | ed17e4d239eec23302f3fdbb9647ad96ddcf6a2c /src/gallium/auxiliary/util/u_math.h | |
| parent | f0ca9f71341f494be961aacc08bddd9cea28fca2 (diff) | |
util: Define round and roundf on MSVC.
Diffstat (limited to 'src/gallium/auxiliary/util/u_math.h')
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index 37294b7203..30555f92a6 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -176,7 +176,7 @@ static INLINE float logf( float f ) #define isfinite(x) _finite((double)(x)) #define isnan(x) _isnan((double)(x)) -#endif +#endif /* _MSC_VER < 1400 && !defined(__cplusplus) */ static INLINE double log2( double x ) { @@ -184,6 +184,18 @@ static INLINE double log2( double x ) return log( x ) * invln2; } +static INLINE double +round(double x) +{ + return x >= 0.0 ? floor(x + 0.5) : ceil(x - 0.5); +} + +static INLINE float +roundf(float x) +{ + return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f); +} + #endif /* _MSC_VER */ |