X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fmsvc_pbd.h;h=97ac72ff27419a775580682531e08055fc667f06;hb=ed7b6fee0c340986cda609d40029c9ed32382cb6;hp=a623ca2eb23758ae1a3e436e8af50ab0572406c2;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git

diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h
index a623ca2eb2..97ac72ff27 100644
--- a/libs/pbd/pbd/msvc_pbd.h
+++ b/libs/pbd/pbd/msvc_pbd.h
@@ -82,29 +82,10 @@
 extern "C" {
 #endif	/* __cplusplus */
 
-// This function is (hopefully) temporary and is placed here
-// because 'g_usleep()' doesn't seem to work very well for glib-win32
-// JE -  let's see if we can do without this now! void    pbd_g_usleep (unsigned long microseconds);
-
 #ifdef __cplusplus
 }		/* extern "C" */
 #endif	/* __cplusplus */
 
-#ifndef POLLIN
-#define POLLIN				1
-#define POLLPRI				2
-#define POLLOUT				4
-#define POLLERR				8
-#define POLLHUP				16
-#define POLLNVAL			32
-#define NPOLLFILE			64
-
-#define POLLRDNORM			POLLIN
-#define POLLRDBAND			POLLIN
-#define POLLWRNORM			POLLOUT
-#define POLLWRBAND			POLLOUT
-#endif
-
 #ifdef PLATFORM_WINDOWS
 
 #ifndef PBDEXTN_API
@@ -213,13 +194,6 @@ typedef struct
 	char				dd_name[1];
 } DIR;
 
-struct pollfd
-{
-	int fd;
-	short events;
-	short revents;
-};
-
 typedef unsigned int nfds_t;
 
 #ifdef __cplusplus
@@ -229,8 +203,18 @@ extern "C" {
 LIBPBD_API int				__cdecl         gettimeofday(struct timeval *__restrict tv, __timezone_ptr_t tz);
 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);
+
+#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 {