diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2016-08-19 12:56:34 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2016-08-19 14:11:01 +0100 |
| commit | 8e2d1c7f2a099df5701a605ec884e786dcedae8b (patch) | |
| tree | 4655a13033d30904e3fdb5efb72f81aabbdb91ef /libs/pbd/pbd | |
| parent | 4ece16f3488d77a74ca8ed043ed086607a39eabb (diff) | |
Move 'round()' / 'trunc()' etc so that they won't conflict with any versions already available in MSVC
Diffstat (limited to 'libs/pbd/pbd')
| -rw-r--r-- | libs/pbd/pbd/msvc_pbd.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |