diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2016-11-18 18:17:39 +0000 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2016-11-18 18:19:08 +0000 |
| commit | ed7b6fee0c340986cda609d40029c9ed32382cb6 (patch) | |
| tree | f5437b33115868ec09931204ee5f45d894090f21 /libs/pbd/pbd | |
| parent | 3e3791b72e23861ebac5061baa7fc003eefb75a7 (diff) | |
Remove the MSVC 'poll()' emulation now that Ardour's stopped using poll()
Diffstat (limited to 'libs/pbd/pbd')
| -rw-r--r-- | libs/pbd/pbd/msvc_pbd.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h index 9a3c102662..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,7 +203,6 @@ 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); |