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 --- libs/pbd/pbd/msvc_pbd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/pbd/pbd') diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h index 1a017fcb8a..9a3c102662 100644 --- a/libs/pbd/pbd/msvc_pbd.h +++ b/libs/pbd/pbd/msvc_pbd.h @@ -230,17 +230,17 @@ LIBPBD_API int __cdecl gettimeofday(struct timeval *__restrict tv, __ LIBPBD_API ssize_t PBD_APICALLTYPE pread(int handle, void *buf, size_t nbytes, off_t offset); LIBPBD_API ssize_t PBD_APICALLTYPE pwrite(int handle, const void *buf, size_t nbytes, off_t offset); LIBPBD_API int PBD_APICALLTYPE poll(struct pollfd *fds, nfds_t nfds, int timeout); -LIBPBD_API float PBD_APICALLTYPE roundf(float x); -LIBPBD_API double PBD_APICALLTYPE round(double x); -LIBPBD_API double PBD_APICALLTYPE trunc(double x); #if defined(_MSC_VER) && (_MSC_VER < 1800) LIBPBD_API double PBD_APICALLTYPE expm1(double x); LIBPBD_API double PBD_APICALLTYPE log1p(double x); +LIBPBD_API double PBD_APICALLTYPE round(double x); +LIBPBD_API float PBD_APICALLTYPE roundf(float x); #endif #if defined(_MSC_VER) && (_MSC_VER < 1900) LIBPBD_API double PBD_APICALLTYPE log2 (double x); +LIBPBD_API double PBD_APICALLTYPE trunc(double x); #endif namespace PBD { -- cgit v1.2.3