diff options
author | Oliver Stöneberg <oliverst@online.de> | 2015-01-31 23:54:38 +0100 |
---|---|---|
committer | Oliver Stöneberg <oliverst@online.de> | 2015-01-31 23:54:38 +0100 |
commit | 6b75e786a3693138e8c49f61b28e0730c2231b0b (patch) | |
tree | 1536760f0f89d311e05ed93d3c5e55b9fb1c86ff | |
parent | 78bacb07c2f07359c2fb6d81d3e889a1efdd0e14 (diff) |
some winprefix.h cleanups (nw)
-rw-r--r-- | src/osd/windows/winprefix.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/osd/windows/winprefix.h b/src/osd/windows/winprefix.h index 979a11d9386..411e327a9d4 100644 --- a/src/osd/windows/winprefix.h +++ b/src/osd/windows/winprefix.h @@ -13,22 +13,18 @@ #ifdef _MSC_VER #include <assert.h> #include <malloc.h> -#if _MSC_VER < 1800 +#if _MSC_VER < 1500 // < VS2008 +#define vsnprintf _vsnprintf +#elif _MSC_VER < 1800 // < VS2013 #define alloca _alloca #define round(x) floor((x) + 0.5) -#endif -#if _MSC_VER < 1500 -#define vsnprintf _vsnprintf -#endif -#if _MSC_VER < 1800 +#define strtoll _strtoi64 #define _USE_MATH_DEFINES #include <math.h> static __inline double fmin(double x, double y){ return (x < y) ? x : y; } static __inline double fmax(double x, double y){ return (x > y) ? x : y; } static __inline double log2(double x) { return log(x) * M_LOG2E; } -#define strtoll _strtoi64 -#endif -#if _MSC_VER < 1900 +#elif _MSC_VER < 1900 // < VS2015 #define snprintf _snprintf #else #pragma warning (disable: 4091) |