apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr/include apr_errno.h
Date Fri, 09 Apr 2004 01:36:32 GMT
rbb         2004/04/08 18:36:32

  Modified:    .        STATUS
               include  apr_errno.h
  Log:
  Deprecated APR_ETIMEDOUT.  Everything should be using APR_TIMESUP
  
  Revision  Changes    Path
  1.198     +1 -6      apr/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apr/STATUS,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- STATUS	18 Mar 2004 18:19:07 -0000	1.197
  +++ STATUS	9 Apr 2004 01:36:32 -0000	1.198
  @@ -25,11 +25,6 @@
   
   RELEASE 1.0 SHOWSTOPPERS:
   
  -    * Timeout status codes aren't consistant across platforms.  Some use
  -      APR_TIMEUP while others use APR_ETIMEDOUT.  These need to be combined into
  -      one code (APR_TIMEUP), and APR_ETIMEDOUT needs to be removed and
  -      deprecated.
  -
       * apr_global_mutex_child_init and apr_proc_mutex_child_init aren't
         portable.  There are a variety of problems with the locking API when it
         is used with apr_create_proc instead of apr_fork.  First, _child_init
  
  
  
  1.119     +19 -6     apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_errno.h,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- apr_errno.h	16 Mar 2004 02:09:38 -0000	1.118
  +++ apr_errno.h	9 Apr 2004 01:36:32 -0000	1.119
  @@ -709,7 +709,8 @@
   #define APR_ECONNRESET     (APR_OS_START_CANONERR + 19)
   #endif
   
  -/** @see APR_STATUS_IS_ETIMEDOUT */
  +/** @see APR_STATUS_IS_ETIMEDOUT 
  + *  @deprecated */
   #ifdef ETIMEDOUT
   #define APR_ETIMEDOUT ETIMEDOUT
   #else
  @@ -884,7 +885,10 @@
                   || (s) == APR_OS_START_SYSERR + SOCECONNABORTED)
   #define APR_STATUS_IS_ECONNRESET(s)     ((s) == APR_ECONNRESET \
                   || (s) == APR_OS_START_SYSERR + SOCECONNRESET)
  -#define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT \
  +// XXX deprecated
  +#define APR_STATUS_IS_ETIMEDOUT(s)         ((s) == APR_ETIMEDOUT \
  +                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
  +#define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP \
                   || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
   #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                   || (s) == APR_OS_START_SYSERR + SOCEHOSTUNREACH)
  @@ -1019,7 +1023,11 @@
   #define APR_STATUS_IS_ECONNRESET(s)     ((s) == APR_ECONNRESET \
                   || (s) == APR_OS_START_SYSERR + ERROR_NETNAME_DELETED \
                   || (s) == APR_OS_START_SYSERR + WSAECONNRESET)
  -#define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT \
  +// XXX deprecated
  +#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_TIMEUP(s)         ((s) == APR_TIMEUP \
                   || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \
                   || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
   #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
  @@ -1084,7 +1092,11 @@
                   || (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 \
  +// XXX deprecated
  +#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_TIMEUP(s)         ((s) == APR_TIMEUP \
                   || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \
                   || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
   #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
  @@ -1189,8 +1201,9 @@
   
   /** Connection Reset by peer */
   #define APR_STATUS_IS_ECONNRESET(s)      ((s) == APR_ECONNRESET)
  -/** Operation timed out */
  -#define APR_STATUS_IS_ETIMEDOUT(s)       ((s) == APR_ETIMEDOUT)    
  +/** Operation timed out
  + *  @deprecated */
  +#define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT)
   /** no route to host */
   #define APR_STATUS_IS_EHOSTUNREACH(s)    ((s) == APR_EHOSTUNREACH)
   /** network is unreachable */
  
  
  

Mime
View raw message