Move 'round()' / 'trunc()' etc so that they won't conflict with any versions already...

[ardour.git] / libs / pbd / pbd / msvc_pbd.h

diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h
index 1a017fcb8ae61e74d160e9f153f50c9d4c3bc268..9a3c10266223cb092afcecd43d87bc6f7c461dd8 100644 (file)
--- 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 {