diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pthread-barrier.h | 2 | ||||
| -rw-r--r-- | include/uv-os390.h | 3 | ||||
| -rw-r--r-- | include/uv-unix.h | 4 | ||||
| -rw-r--r-- | include/uv-version.h | 4 | ||||
| -rw-r--r-- | include/uv-win.h | 11 | ||||
| -rw-r--r-- | include/uv.h | 2 |
6 files changed, 19 insertions, 7 deletions
diff --git a/include/pthread-barrier.h b/include/pthread-barrier.h index 3e01705..900ebed 100644 --- a/include/pthread-barrier.h +++ b/include/pthread-barrier.h @@ -18,7 +18,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define _UV_PTHREAD_BARRIER_ #include <errno.h> #include <pthread.h> +#if !defined(__MVS__) #include <semaphore.h> /* sem_t */ +#endif #define PTHREAD_BARRIER_SERIAL_THREAD 0x12345 diff --git a/include/uv-os390.h b/include/uv-os390.h index b0b068f..58f9261 100644 --- a/include/uv-os390.h +++ b/include/uv-os390.h @@ -24,4 +24,7 @@ #define UV_PLATFORM_SEM_T int +#define UV_PLATFORM_LOOP_FIELDS \ + void* ep; \ + #endif /* UV_MVS_H */ diff --git a/include/uv-unix.h b/include/uv-unix.h index bca2714..3030f71 100644 --- a/include/uv-unix.h +++ b/include/uv-unix.h @@ -36,7 +36,9 @@ #include <termios.h> #include <pwd.h> +#if !defined(__MVS__) #include <semaphore.h> +#endif #include <pthread.h> #include <signal.h> @@ -44,6 +46,8 @@ #if defined(__linux__) # include "uv-linux.h" +#elif defined (__MVS__) +# include "uv-os390.h" #elif defined(_AIX) # include "uv-aix.h" #elif defined(__sun) diff --git a/include/uv-version.h b/include/uv-version.h index 3cb9b5f..e165809 100644 --- a/include/uv-version.h +++ b/include/uv-version.h @@ -31,8 +31,8 @@ */ #define UV_VERSION_MAJOR 1 -#define UV_VERSION_MINOR 9 -#define UV_VERSION_PATCH 2 +#define UV_VERSION_MINOR 11 +#define UV_VERSION_PATCH 1 #define UV_VERSION_IS_RELEASE 0 #define UV_VERSION_SUFFIX "dev" diff --git a/include/uv-win.h b/include/uv-win.h index a75dba8..9677ff1 100644 --- a/include/uv-win.h +++ b/include/uv-win.h @@ -49,6 +49,7 @@ typedef struct pollfd { #include <process.h> #include <signal.h> +#include <fcntl.h> #include <sys/stat.h> #if defined(_MSC_VER) && _MSC_VER < 1600 @@ -116,7 +117,7 @@ typedef struct pollfd { {0xb5367df0, 0xcbac, 0x11cf, \ {0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}} - typedef BOOL PASCAL (*LPFN_ACCEPTEX) + typedef BOOL (PASCAL *LPFN_ACCEPTEX) (SOCKET sListenSocket, SOCKET sAcceptSocket, PVOID lpOutputBuffer, @@ -126,7 +127,7 @@ typedef struct pollfd { LPDWORD lpdwBytesReceived, LPOVERLAPPED lpOverlapped); - typedef BOOL PASCAL (*LPFN_CONNECTEX) + typedef BOOL (PASCAL *LPFN_CONNECTEX) (SOCKET s, const struct sockaddr* name, int namelen, @@ -135,7 +136,7 @@ typedef struct pollfd { LPDWORD lpdwBytesSent, LPOVERLAPPED lpOverlapped); - typedef void PASCAL (*LPFN_GETACCEPTEXSOCKADDRS) + typedef void (PASCAL *LPFN_GETACCEPTEXSOCKADDRS) (PVOID lpOutputBuffer, DWORD dwReceiveDataLength, DWORD dwLocalAddressLength, @@ -145,13 +146,13 @@ typedef struct pollfd { LPSOCKADDR* RemoteSockaddr, LPINT RemoteSockaddrLength); - typedef BOOL PASCAL (*LPFN_DISCONNECTEX) + typedef BOOL (PASCAL *LPFN_DISCONNECTEX) (SOCKET hSocket, LPOVERLAPPED lpOverlapped, DWORD dwFlags, DWORD reserved); - typedef BOOL PASCAL (*LPFN_TRANSMITFILE) + typedef BOOL (PASCAL *LPFN_TRANSMITFILE) (SOCKET hSocket, HANDLE hFile, DWORD nNumberOfBytesToWrite, diff --git a/include/uv.h b/include/uv.h index baa0b28..31f09f0 100644 --- a/include/uv.h +++ b/include/uv.h @@ -363,6 +363,8 @@ typedef enum { } uv_membership; +UV_EXTERN int uv_translate_sys_error(int sys_errno); + UV_EXTERN const char* uv_strerror(int err); UV_EXTERN const char* uv_err_name(int err); |