diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-02-26 11:47:46 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-02-26 16:53:16 +0000 |
| commit | 46110c5d56eb7a2d3c69b2d8565c7631541511b1 (patch) | |
| tree | 66961cf2e40443ef5d82935d5598ab18194f5a37 /include | |
| parent | fd090fdadd6dd955e7663d83885d00678f60e133 (diff) | |
include,auxiliary: Remove support for MSVC older then 2008.
MSVC 2008 (shipped with Windows SDK 7.0.7600) is the oldest we
need to support. At least on llvmpipe, gallium/auxiliary, and util
modules. For the remaining modules (particular all OpenGL specific
code) can be built with MSVC 2013.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/c99_compat.h | 11 | ||||
| -rw-r--r-- | include/c99_math.h | 71 |
2 files changed, 6 insertions, 76 deletions
diff --git a/include/c99_compat.h b/include/c99_compat.h index e5d0ae43a50..f56f6f326f8 100644 --- a/include/c99_compat.h +++ b/include/c99_compat.h @@ -33,6 +33,11 @@ * MSVC hacks. */ #if defined(_MSC_VER) + +# if _MSC_VER < 1500 +# error "Microsoft Visual Studio 2008 or higher required" +# endif + /* * Visual Studio 2012 will complain if we define the `inline` keyword, but * actually it only supports the keyword on C++. @@ -116,11 +121,7 @@ # elif defined(__GNUC__) # define __func__ __FUNCTION__ # elif defined(_MSC_VER) -# if _MSC_VER >= 1300 -# define __func__ __FUNCTION__ -# else -# define __func__ "<unknown>" -# endif +# define __func__ __FUNCTION__ # else # define __func__ "<unknown>" # endif diff --git a/include/c99_math.h b/include/c99_math.h index 9e31d0693b6..5d4f5359db4 100644 --- a/include/c99_math.h +++ b/include/c99_math.h @@ -40,81 +40,10 @@ #if defined(_MSC_VER) -#if _MSC_VER < 1400 && !defined(__cplusplus) - -static inline float cosf( float f ) -{ - return (float) cos( (double) f ); -} - -static inline float sinf( float f ) -{ - return (float) sin( (double) f ); -} - -static inline float ceilf( float f ) -{ - return (float) ceil( (double) f ); -} - -static inline float floorf( float f ) -{ - return (float) floor( (double) f ); -} - -static inline float powf( float f, float g ) -{ - return (float) pow( (double) f, (double) g ); -} - -static inline float sqrtf( float f ) -{ - return (float) sqrt( (double) f ); -} - -static inline float fabsf( float f ) -{ - return (float) fabs( (double) f ); -} - -static inline float logf( float f ) -{ - return (float) log( (double) f ); -} - -static inline float frexpf(float x, int *exp) -{ - return (float) frexp(x, exp); -} - -static inline float ldexpf(float x, int exp) -{ - return (float) ldexp(x, exp); -} - -static inline float logf(float x) -{ - return (float) log(x); -} - -static inline float expf(float x) -{ - return (float) exp(x); -} - - -#else -/* Work-around an extra semi-colon in VS 2005 logf definition */ -#ifdef logf -#undef logf -#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 ) |