From 8e2d1c7f2a099df5701a605ec884e786dcedae8b Mon Sep 17 00:00:00 2001 From: John Emmas Date: Fri, 19 Aug 2016 12:56:34 +0100 Subject: Move 'round()' / 'trunc()' etc so that they won't conflict with any versions already available in MSVC --- msvc_extra_headers/ardourext/misc.h.input | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'msvc_extra_headers') diff --git a/msvc_extra_headers/ardourext/misc.h.input b/msvc_extra_headers/ardourext/misc.h.input index 6b6533b510..47cff56295 100644 --- a/msvc_extra_headers/ardourext/misc.h.input +++ b/msvc_extra_headers/ardourext/misc.h.input @@ -252,17 +252,17 @@ inline int64_t abs(int64_t val) throw() #endif #if !defined(LIBPBD_API) || defined(PBD_IS_IN_WIN_STATIC_LIB) -extern double round(double x); -extern float roundf(float x); - // Emulate some C99 math functions which MSVC itself didn't // implement until later in life. #if defined(_MSC_VER) && (_MSC_VER < 1800) extern double expm1(double x); extern double log1p(double x); +extern double round(double x); +extern float roundf(float x); #endif #if defined(_MSC_VER) && (_MSC_VER < 1900) extern double log2 (double x); +extern double trunc(double x); #endif #endif -- cgit v1.2.3