httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr_errno.h
Date Thu, 21 Oct 1999 11:38:47 GMT
rbb         99/10/21 04:38:47

  Modified:    src/lib/apr/include apr_errno.h
  Log:
  Protect OS_START_ERROR from other namespaces, by making it APR_OS_START_ERROR.
  Also use APR_OS_START_ERROR for ALL error values, including those that are
  immitating errno values.
  
  Revision  Changes    Path
  1.6       +84 -84    apache-2.0/src/lib/apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_errno.h	1999/10/20 23:14:13	1.5
  +++ apr_errno.h	1999/10/21 11:38:46	1.6
  @@ -62,7 +62,7 @@
   extern "C" {
   #endif /* __cplusplus */
   
  -#define OS_START_ERROR   4000
  +#define APR_OS_START_ERROR   4000
   
   /* If this definition of APRStatus changes, then we can remove this, but right
      now, the decision was to use an errno-like implementation.
  @@ -74,354 +74,354 @@
   #ifdef EACCES
   #define APR_EACCES EACCES
   #else
  -#define APR_EACCES 3000
  +#define APR_EACCES (APR_OS_START_ERROR + 3000)
   #endif
   
   #ifdef EEXIST
   #define APR_EEXIST EEXIST
   #else
  -#define APR_EEXIST 3001
  +#define APR_EEXIST (APR_OS_START_ERROR + 3001)
   #endif
   
   #ifdef EISDIR
   #define APR_EISDIR EISDIR
   #else
  -#define APR_EISDIR 3002
  +#define APR_EISDIR (APR_OS_START_ERROR + 3002)
   #endif
   
   #ifdef ENAMETOOLONG
   #define APR_ENAMETOOLONG ENAMETOOLONG
   #else
  -#define APR_ENAMETOOLONG 3003
  +#define APR_ENAMETOOLONG (APR_OS_START_ERROR + 3003)
   #endif
   
   #ifdef ENOENT
   #define APR_ENOENT ENOENT
   #else
  -#define APR_ENOENT 3004
  +#define APR_ENOENT (APR_OS_START_ERROR + 3004)
   #endif
   
   #ifdef ENOTDIR
   #define APR_ENOTDIR ENOTDIR
   #else
  -#define APR_ENOTDIR 3005
  +#define APR_ENOTDIR (APR_OS_START_ERROR + 3005)
   #endif
   
   #ifdef ENXIO
   #define APR_ENXIO ENXIO
   #else
  -#define APR_ENXIO 3006
  +#define APR_ENXIO (APR_OS_START_ERROR + 3006)
   #endif
   
   #ifdef ENODEV
   #define APR_ENODEV ENODEV
   #else
  -#define APR_ENODEV 3007
  +#define APR_ENODEV (APR_OS_START_ERROR + 3007)
   #endif
   
   #ifdef EROFS
   #define APR_EROFS EROFS
   #else
  -#define APR_EROFS 3008
  +#define APR_EROFS (APR_OS_START_ERROR + 3008)
   #endif
   
   #ifdef ETXTBSY
   #define APR_ETXTBSY ETXTBSY
   #else
  -#define APR_ETXTBSY 3009
  +#define APR_ETXTBSY (APR_OS_START_ERROR + 3009)
   #endif
   
   #ifdef EFAULT
   #define APR_EFAULT EFAULT
   #else
  -#define APR_EFAULT 3010
  +#define APR_EFAULT (APR_OS_START_ERROR + 3010)
   #endif
   
   #ifdef ELOOP
   #define APR_ELOOP ELOOP
   #else
  -#define APR_ELOOP 3011
  +#define APR_ELOOP (APR_OS_START_ERROR + 3011)
   #endif
   
   #ifdef ENOSPC
   #define APR_ENOSPC ENOSPC
   #else
  -#define APR_ENOSPC 3012
  +#define APR_ENOSPC (APR_OS_START_ERROR + 3012)
   #endif
   
   #ifdef ENONOMEM
   #define APR_ENOMEM ENOMEM
   #else
  -#define APR_ENOMEM 3013
  +#define APR_ENOMEM (APR_OS_START_ERROR + 3013)
   #endif
   
   #ifdef EMFILE
   #define APR_EMFILE EMFILE
   #else
  -#define APR_EMFILE 3014
  +#define APR_EMFILE (APR_OS_START_ERROR + 3014)
   #endif
   
   #ifdef ENFILE
   #define APR_ENFILE ENFILE
   #else
  -#define APR_ENFILE 3015
  +#define APR_ENFILE (APR_OS_START_ERROR + 3015)
   #endif
   
   #ifdef EBADF
   #define APR_EBADF EBADF
   #else
  -#define APR_EBADF 3016
  +#define APR_EBADF (APR_OS_START_ERROR + 3016)
   #endif
   
   #ifdef EPERM
   #define APR_EPERM EPERM
   #else
  -#define APR_EPERM 3017
  +#define APR_EPERM (APR_OS_START_ERROR + 3017)
   #endif
   
   #ifdef EIO
   #define APR_EIO EIO
   #else
  -#define APR_EIO 3018
  +#define APR_EIO (APR_OS_START_ERROR + 3018)
   #endif
   
   #ifdef EINVAL
   #define APR_EINVAL EINVAL
   #else
  -#define APR_EINVAL 3019
  +#define APR_EINVAL (APR_OS_START_ERROR + 3019)
   #endif
   
   #ifdef ENOEMPTY
   #define APR_ENOEMPTY ENOEMPTY
   #else
  -#define APR_ENOEMPTY 3020
  +#define APR_ENOEMPTY (APR_OS_START_ERROR + 3020)
   #endif
   
   #ifdef EBUSY
   #define APR_EBUSY EBUSY
   #else
  -#define APR_EBUSY 3021
  +#define APR_EBUSY (APR_OS_START_ERROR + 3021)
   #endif
   
   #ifdef ESPIPE
   #define APR_ESPIPE ESPIPE
   #else
  -#define APR_ESPIPE 3022
  +#define APR_ESPIPE (APR_OS_START_ERROR + 3022)
   #endif
   
   #ifdef EIDRM
   #define APR_EIDRM EIDRM
   #else
  -#define APR_EIDRM 3023
  +#define APR_EIDRM (APR_OS_START_ERROR + 3023)
   #endif
   
   #ifdef ERANGE
   #define APR_ERANGE ERANGE
   #else
  -#define APR_ERANGE 3024
  +#define APR_ERANGE (APR_OS_START_ERROR + 3024)
   #endif
   
   #ifdef E2BIG
   #define APR_E2BIG E2BIG
   #else
  -#define APR_E2BIG 3025
  +#define APR_E2BIG (APR_OS_START_ERROR + 3025)
   #endif
   
   #ifdef EAGAIN
   #define APR_EAGAIN EAGAIN
   #else
  -#define APR_EAGAIN 3026
  +#define APR_EAGAIN (APR_OS_START_ERROR + 3026)
   #endif
   
   #ifdef EFBIG
   #define APR_EFBIG EFBIG
   #else
  -#define APR_EFBIG 3027
  +#define APR_EFBIG (APR_OS_START_ERROR + 3027)
   #endif
   
   #ifdef EINTR
   #define APR_EINTR EINTR
   #else
  -#define APR_EINTR 3028
  +#define APR_EINTR (APR_OS_START_ERROR + 3028)
   #endif
   
   #ifdef EDEADLK
   #define APR_EDEADLK EDEADLK
   #else
  -#define APR_EDEADLK 3029
  +#define APR_EDEADLK (APR_OS_START_ERROR + 3029)
   #endif
   
   #ifdef ENOLCK
   #define APR_ENOLCK ENOLCK
   #else
  -#define APR_ENOLCK 3030
  +#define APR_ENOLCK (APR_OS_START_ERROR + 3030)
   #endif
   
   #ifdef EWOULDBLOCK
   #define APR_EWOULDBLOCK EWOULDBLOCK
   #else
  -#define APR_EWOULDBLOCK 3031
  +#define APR_EWOULDBLOCK (APR_OS_START_ERROR + 3031)
   #endif
   
   #ifdef EPROTONOSUPPORT
   #define APR_EPROTONOSUPPORT EPROTONOSUPPORT
   #else
  -#define APR_EPROTONOSUPPORT 3032
  +#define APR_EPROTONOSUPPORT (APR_OS_START_ERROR + 3032)
   #endif
   
   #ifdef ENOTSOCK
   #define APR_ENOTSOCK ENOTSOCK
   #else
  -#define APR_ENOTSOCK 3033
  +#define APR_ENOTSOCK (APR_OS_START_ERROR + 3033)
   #endif
   
   #ifdef ENOTCONN
   #define APR_ENOTCONN ENOTCONN
   #else
  -#define APR_ENOTCONN 3034
  +#define APR_ENOTCONN (APR_OS_START_ERROR + 3034)
   #endif
   
   #ifdef EOPNOTSUPP
   #define APR_EOPNOTSUPP EOPNOTSUPP
   #else
  -#define APR_EOPNOTSUPP 3035
  +#define APR_EOPNOTSUPP (APR_OS_START_ERROR + 3035)
   #endif
   
   #ifdef HOST_NOT_FOUND
   #define APR_EHOSTNOTFOUND HOST_NOT_FOUND
   #else
  -#define APR_EHOSTNOTFOUND 3036
  +#define APR_EHOSTNOTFOUND (APR_OS_START_ERROR + 3036)
   #endif
   
   #ifdef NO_DATA
   #define APR_ENODATA NO_DATA
   #else
  -#define APR_ENODATA 3037
  +#define APR_ENODATA (APR_OS_START_ERROR + 3037)
   #endif
   
   #ifdef NO_ADDRESS
   #define APR_ENOADDRESS NO_ADDRESS
   #else
  -#define APR_ENOADDRESS 3038
  +#define APR_ENOADDRESS (APR_OS_START_ERROR + 3038)
   #endif
   
   #ifdef NO_RECOVERY
   #define APR_ENORECOVERY NO_RECOVERY
   #else
  -#define APR_ENORECOVERY 3039
  +#define APR_ENORECOVERY (APR_OS_START_ERROR + 3039)
   #endif
   
   #ifdef EISCONN
   #define APR_EISCONN EISCONN
   #else
  -#define APR_EISCONN 3040
  +#define APR_EISCONN (APR_OS_START_ERROR + 3040)
   #endif
   
   #ifdef ETIMEDOUT
   #define APR_ETIMEDOUT ETIMEDOUT
   #else
  -#define APR_ETIMEDOUT 3041
  +#define APR_ETIMEDOUT (APR_OS_START_ERROR + 3041)
   #endif
   
   #ifdef ECONNREFUSED
   #define APR_ECONNREFUSED ECONNREFUSED
   #else
  -#define APR_ECONNREFUSED 3042
  +#define APR_ECONNREFUSED (APR_OS_START_ERROR + 3042)
   #endif
   
   #ifdef ENETUNREACH
   #define APR_ENETUNREACH ENETUNREACH
   #else
  -#define APR_ENETUNREACH 3043
  +#define APR_ENETUNREACH (APR_OS_START_ERROR + 3043)
   #endif
   
   #ifdef EADDRINUSE
   #define APR_EADDRINUSE EADDRINUSE
   #else
  -#define APR_EADDRINUSE 3044
  +#define APR_EADDRINUSE (APR_OS_START_ERROR + 3044)
   #endif
   
   #ifdef EINPROGRESS
   #define APR_EINPROGRESS EINPROGRESS
   #else
  -#define APR_EINPROGRESS 3045
  +#define APR_EINPROGRESS (APR_OS_START_ERROR + 3045)
   #endif
   
   #ifdef EALREADY
   #define APR_EALREADY EALREADY
   #else
  -#define APR_EALREADY 3046
  +#define APR_EALREADY (APR_OS_START_ERROR + 3046)
   #endif
   
   #ifdef EAFNOSUPPORT
   #define APR_EAFNOSUPPORT EAFNOSUPPORT
   #else
  -#define APR_EAFNOSUPPORT 3047
  +#define APR_EAFNOSUPPORT (APR_OS_START_ERROR + 3047)
   #endif
   
   #ifdef ENOPROTOOPT
   #define APR_ENOPROTOOPT ENOPROTOOPT
   #else
  -#define APR_ENOPROTOOPT 3048
  +#define APR_ENOPROTOOPT (APR_OS_START_ERROR + 3048)
   #endif
   
   #ifdef ENOCHILD
   #define APR_ENOCHILD ENOCHILD
   #else
  -#define APR_ENOCHILD 3049
  +#define APR_ENOCHILD (APR_OS_START_ERROR + 3049)
   #endif
   
   #ifdef ESRCH
   #define APR_ESRCH ESRCH
   #else
  -#define APR_ESRCH 3050
  +#define APR_ESRCH (APR_OS_START_ERROR + 3050)
   #endif
   
   #ifdef ENOTSUP
   #define APR_ENOTSUP ENOTSUP
   #else
  -#define APR_ENOTSUP 3051
  +#define APR_ENOTSUP (APR_OS_START_ERROR + 3051)
   #endif
   
   
   /*  APR ERROR VALUES */
  -#define APR_ENOSTAT        (OS_START_ERROR + 1)
  -#define APR_ENOPOOL        (OS_START_ERROR + 2)
  -#define APR_ENOFILE        (OS_START_ERROR + 3)
  -#define APR_EBADDATE       (OS_START_ERROR + 4)
  -#define APR_ENOCONT        (OS_START_ERROR + 5)
  -#define APR_ENOPROC        (OS_START_ERROR + 6)
  -#define APR_ENOTIME        (OS_START_ERROR + 7)
  -#define APR_ENODIR         (OS_START_ERROR + 8)
  -#define APR_ENOLOCK        (OS_START_ERROR + 9)
  -#define APR_ENOPOLL        (OS_START_ERROR + 10)
  -#define APR_ENOSOCKET      (OS_START_ERROR + 11)
  -#define APR_ENOTHREAD      (OS_START_ERROR + 12)
  -#define APR_ENOTHDKEY      (OS_START_ERROR + 13)
  -#define APR_ENOTTHREADSAFE (OS_START_ERROR + 14)
  +#define APR_ENOSTAT        (APR_OS_START_ERROR + 1)
  +#define APR_ENOPOOL        (APR_OS_START_ERROR + 2)
  +#define APR_ENOFILE        (APR_OS_START_ERROR + 3)
  +#define APR_EBADDATE       (APR_OS_START_ERROR + 4)
  +#define APR_ENOCONT        (APR_OS_START_ERROR + 5)
  +#define APR_ENOPROC        (APR_OS_START_ERROR + 6)
  +#define APR_ENOTIME        (APR_OS_START_ERROR + 7)
  +#define APR_ENODIR         (APR_OS_START_ERROR + 8)
  +#define APR_ENOLOCK        (APR_OS_START_ERROR + 9)
  +#define APR_ENOPOLL        (APR_OS_START_ERROR + 10)
  +#define APR_ENOSOCKET      (APR_OS_START_ERROR + 11)
  +#define APR_ENOTHREAD      (APR_OS_START_ERROR + 12)
  +#define APR_ENOTHDKEY      (APR_OS_START_ERROR + 13)
  +#define APR_ENOTTHREADSAFE (APR_OS_START_ERROR + 14)
   
   /*  APR STATUS VALUES */
  -#define APR_INCHILD        (OS_START_ERROR + 500 + 1)
  -#define APR_INPARENT       (OS_START_ERROR + 500 + 2)
  -#define APR_DETACH         (OS_START_ERROR + 500 + 3)
  -#define APR_NOTDETACH      (OS_START_ERROR + 500 + 4)
  -#define APR_CHILD_DONE     (OS_START_ERROR + 500 + 5)
  -#define APR_CHILD_NOTDONE  (OS_START_ERROR + 500 + 6)
  -#define APR_TIMEUP         (OS_START_ERROR + 500 + 7)
  -#define APR_INVALSOCK      (OS_START_ERROR + 500 + 8)
  -#define APR_ALLSTD         (OS_START_ERROR + 500 + 9)
  -#define APR_STDOUT         (OS_START_ERROR + 500 + 10)
  -#define APR_STDERR         (OS_START_ERROR + 500 + 11)
  -#define APR_BADCH          (OS_START_ERROR + 500 + 12)
  -#define APR_BADARG         (OS_START_ERROR + 500 + 13)
  -#define APR_EOF            (OS_START_ERROR + 500 + 14)
  -#define APR_NOTFOUND       (OS_START_ERROR + 500 + 15)
  +#define APR_INCHILD        (APR_OS_START_ERROR + 500 + 1)
  +#define APR_INPARENT       (APR_OS_START_ERROR + 500 + 2)
  +#define APR_DETACH         (APR_OS_START_ERROR + 500 + 3)
  +#define APR_NOTDETACH      (APR_OS_START_ERROR + 500 + 4)
  +#define APR_CHILD_DONE     (APR_OS_START_ERROR + 500 + 5)
  +#define APR_CHILD_NOTDONE  (APR_OS_START_ERROR + 500 + 6)
  +#define APR_TIMEUP         (APR_OS_START_ERROR + 500 + 7)
  +#define APR_INVALSOCK      (APR_OS_START_ERROR + 500 + 8)
  +#define APR_ALLSTD         (APR_OS_START_ERROR + 500 + 9)
  +#define APR_STDOUT         (APR_OS_START_ERROR + 500 + 10)
  +#define APR_STDERR         (APR_OS_START_ERROR + 500 + 11)
  +#define APR_BADCH          (APR_OS_START_ERROR + 500 + 12)
  +#define APR_BADARG         (APR_OS_START_ERROR + 500 + 13)
  +#define APR_EOF            (APR_OS_START_ERROR + 500 + 14)
  +#define APR_NOTFOUND       (APR_OS_START_ERROR + 500 + 15)
   /* A simple value to be used to initialze a status variable. */
  -#define APR_EINIT          (OS_START_ERROR + 500 + 16)  
  +#define APR_EINIT          (APR_OS_START_ERROR + 500 + 16)  
   /* Not implemented either because we haven't gotten to it yet, or 
    * because it is not possible to do correctly.  
    */
  -#define APR_ENOTIMPL       (OS_START_ERROR + 500 + 17)
  +#define APR_ENOTIMPL       (APR_OS_START_ERROR + 500 + 17)
   
   #ifdef __cplusplus
   }
  
  
  

Mime
View raw message