diff options
author | John Emmas <johne53@tiscali.co.uk> | 2016-09-30 08:24:51 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2016-09-30 08:24:51 +0100 |
commit | 9df3a2a547efad089bab177a8b9e285a04287f07 (patch) | |
tree | 684cd05aa83f4025bdc33a3d57177cb998f0951a /msvc_extra_headers/ardourext/misc.h.input | |
parent | 85072e16aa5e16d9cd3d059d906b2d94fac1d24b (diff) |
When building with MSVC some of the header file stuff is only relevant in early versions (e.g. VC8)
Diffstat (limited to 'msvc_extra_headers/ardourext/misc.h.input')
-rw-r--r-- | msvc_extra_headers/ardourext/misc.h.input | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/msvc_extra_headers/ardourext/misc.h.input b/msvc_extra_headers/ardourext/misc.h.input index 47cff56295..a5f4e9e95c 100644 --- a/msvc_extra_headers/ardourext/misc.h.input +++ b/msvc_extra_headers/ardourext/misc.h.input @@ -196,6 +196,7 @@ typedef _mode_t mode_t; #endif /* _MODE_T_ */ // int64 abs() +#if (defined(_MSC_VER) && (_MSC_VER < 1500)) #ifdef __cplusplus // Normal 'C' doesn't permit over-ridden functions !! inline int64_t abs(int64_t val) throw() { @@ -205,6 +206,7 @@ inline int64_t abs(int64_t val) throw() return val; } #endif +#endif // fmin() and fmax() #define fmin(a, b) min((double)a, (double)b) |