diff options
| author | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2002-07-16 20:23:48 +0000 |
|---|---|---|
| committer | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2002-07-16 20:23:48 +0000 |
| commit | 6dd104e36e8778c9015ce4ecacd3ea2b320f9ec2 (patch) | |
| tree | de4c5a699ba6b9f3b436b949cfa58f09498c5ec8 /include/apr_errno.h | |
| parent | b846f6fafe250716114c3db4ca2ec4c73af6794d (diff) | |
| download | libapr-6dd104e36e8778c9015ce4ecacd3ea2b320f9ec2.tar.gz | |
Added a check for EWOULDBLOCK as well as WSAEWOULDBLOCK to the
NetWare APR_STATUS_IS_EAGAIN() macro. This fixes the handling of
an EWOULDBLOCK return value from a xxx_bucket_read() call. Also removed
some duplicate NetWare macros.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63691 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_errno.h')
| -rw-r--r-- | include/apr_errno.h | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/include/apr_errno.h b/include/apr_errno.h index 7e10c5513..c3d9386a2 100644 --- a/include/apr_errno.h +++ b/include/apr_errno.h @@ -1035,6 +1035,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, #define APR_STATUS_IS_ESPIPE(s) ((s) == APR_ESPIPE) #define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN \ + || (s) == EWOULDBLOCK \ || (s) == APR_OS_START_SYSERR + WSAEWOULDBLOCK) #define APR_STATUS_IS_EINTR(s) ((s) == APR_EINTR \ || (s) == APR_OS_START_SYSERR + WSAEINTR) @@ -1072,33 +1073,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, #define apr_get_os_error() (errno) #define apr_set_os_error(e) (errno = (e)) -#ifdef NETWARE -#define apr_get_netos_error() (WSAGetLastError()+APR_OS_START_SYSERR) - -#define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN \ - || (s) == APR_OS_START_SYSERR + ERROR_NO_DATA \ - || (s) == APR_OS_START_SYSERR + WSAEWOULDBLOCK) -#define APR_STATUS_IS_EINTR(s) ((s) == APR_EINTR \ - || (s) == APR_OS_START_SYSERR + WSAEINTR) -#define APR_STATUS_IS_ENOTSOCK(s) ((s) == APR_ENOTSOCK \ - || (s) == APR_OS_START_SYSERR + WSAENOTSOCK) -#define APR_STATUS_IS_ECONNREFUSED(s) ((s) == APR_ECONNREFUSED \ - || (s) == APR_OS_START_SYSERR + WSAECONNREFUSED) -#define APR_STATUS_IS_EINPROGRESS(s) ((s) == APR_EINPROGRESS \ - || (s) == APR_OS_START_SYSERR + WSAEINPROGRESS) -#define APR_STATUS_IS_ECONNABORTED(s) ((s) == APR_ECONNABORTED \ - || (s) == APR_OS_START_SYSERR + WSAECONNABORTED) -#define APR_STATUS_IS_ECONNRESET(s) ((s) == APR_ECONNRESET \ - || (s) == APR_OS_START_SYSERR + WSAECONNRESET) -#define APR_STATUS_IS_ETIMEDOUT(s) ((s) == APR_ETIMEDOUT \ - || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \ - || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT) -#define APR_STATUS_IS_EHOSTUNREACH(s) ((s) == APR_EHOSTUNREACH \ - || (s) == APR_OS_START_SYSERR + WSAEHOSTUNREACH) -#define APR_STATUS_IS_ENETUNREACH(s) ((s) == APR_ENETUNREACH \ - || (s) == APR_OS_START_SYSERR + WSAENETUNREACH) -#endif - /** no error */ #define APR_STATUS_IS_SUCCESS(s) ((s) == APR_SUCCESS) |