diff options
| author | monty@hundin.mysql.fi <> | 2001-08-23 00:59:19 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-23 00:59:19 +0300 |
| commit | dfcb208e53f048b6eec8f02a62a80749cf57d0a5 (patch) | |
| tree | e1716c6e6a6176b553227ca22c281a03bc6f2214 /include | |
| parent | b57ef1ccb57894538d7d0ee00f3992fe09c34c03 (diff) | |
| parent | e127a952a6a4b63dbe8df7cc59492a4a69041a23 (diff) | |
| download | mariadb-git-dfcb208e53f048b6eec8f02a62a80749cf57d0a5.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index d6a46e1b187..f10411af0aa 100644 --- a/include/global.h +++ b/include/global.h @@ -644,13 +644,18 @@ typedef off_t os_off_t; #endif #if defined(__WIN__) -#define socket_errno WSAGetLastError() +#define socket_errno WSAGetLastError() +#define SOCKET_EINTR WSAEINTR +#define SOCKET_EAGAIN WSAEINPROGRESS #elif defined(OS2) -#define socket_errno sock_errno() +#define socket_errno sock_errno() #define closesocket(A) soclose(A) -#else +#else /* Unix */ #define socket_errno errno -#define closesocket(A) close(A) +#define closesocket(A) close(A) +#define SOCKET_EINTR EINTR +#define SOCKET_EAGAIN EAGAIN +#define SOCKET_EWOULDBLOCK EWOULDBLOCK #endif typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */ |