apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: apr/include apr_errno.h
Date Tue, 16 Jul 2002 20:23:48 GMT
bnicholes    2002/07/16 13:23:48

  Modified:    include  apr_errno.h
  Log:
  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.
  
  Revision  Changes    Path
  1.93      +1 -27     apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_errno.h,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- apr_errno.h	2 Jul 2002 00:10:44 -0000	1.92
  +++ apr_errno.h	16 Jul 2002 20:23:48 -0000	1.93
  @@ -1035,6 +1035,7 @@
   #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)
  @@ -1071,33 +1072,6 @@
   
   #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)
  
  
  

Mime
View raw message