jwoolley    02/05/02 12:38:17

  Modified:    .        CHANGES
               include  apr_errno.h
  Log:
  Fix APR_STATUS_IS_ETIMEDOUT() macro, which had a stray close-paren on
  several platforms.
  
  Submitted by:	Dagfinn Aarvaag <dagfinn.aarvaag@beepscience.com>
  
  Revision  Changes    Path
  1.277     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.276
  retrieving revision 1.277
  diff -u -d -u -r1.276 -r1.277
  --- CHANGES	1 May 2002 10:47:03 -0000	1.276
  +++ CHANGES	2 May 2002 19:38:17 -0000	1.277
  @@ -1,5 +1,8 @@
   Changes with APR b1
   
  +  *) Fixed APR_STATUS_IS_ETIMEDOUT macro.
  +     [Dagfinn Aarvaag <dagfinn.aarvaag@beepscience.com>]
  +
     *) Add --disable-atomics switch to override our handcoded assembly
        optimizations.  Note that this has no effect if your operating
        system has a userspace atomic interface.  [Justin Erenkrantz]
  
  
  
  1.90      +3 -3      apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_errno.h,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -d -u -r1.89 -r1.90
  --- apr_errno.h	17 Apr 2002 20:22:16 -0000	1.89
  +++ apr_errno.h	2 May 2002 19:38:17 -0000	1.90
  @@ -974,7 +974,7 @@
   #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 + WSAETIMEDOUT \
                   || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
   #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                   || (s) == APR_OS_START_SYSERR + WSAEHOSTUNREACH)
  @@ -1037,7 +1037,7 @@
   #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 + WSAETIMEDOUT \
                   || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
   #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                   || (s) == APR_OS_START_SYSERR + WSAEHOSTUNREACH)
  @@ -1079,7 +1079,7 @@
   #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 + WSAETIMEDOUT \
                   || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
   #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                   || (s) == APR_OS_START_SYSERR + WSAEHOSTUNREACH)