diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2014-04-15 23:22:29 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2014-04-15 23:22:29 +0000 |
| commit | 14301bc5156a09a332ab8ff30dd6adaa6320fec4 (patch) | |
| tree | 40cbdc4b7c323e6aa30d1a44c997709c8813ed97 /include | |
| parent | 17a56a951abc49d2939f8ccf95232af0a273214c (diff) | |
| download | libapr-14301bc5156a09a332ab8ff30dd6adaa6320fec4.tar.gz | |
Revert the following, since it introduces a new API:
Merge r1561040 from trunk:
Using UDS, we sometime try ops not supported on UDS. Make this
a known (and therfore handable) issue
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1587750 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_errno.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/apr_errno.h b/include/apr_errno.h index 3c16ba143..58eaf73cc 100644 --- a/include/apr_errno.h +++ b/include/apr_errno.h @@ -833,13 +833,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, #define APR_EAFNOSUPPORT (APR_OS_START_CANONERR + 27) #endif -/** @see APR_STATUS_IS_EOPNOTSUPP */ -#ifdef EOPNOTSUPP -#define APR_EOPNOTSUPP EOPNOTSUPP -#else -#define APR_EOPNOTSUPP (APR_OS_START_CANONERR + 28) -#endif - /** @} */ #if defined(OS2) && !defined(DOXYGEN) @@ -984,8 +977,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED) #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_AFNOSUPPORT \ || (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT) -#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP \ - || (s) == APR_OS_START_SYSERR + SOCEOPNOTSUPP) /* Sorry, too tired to wrap this up for OS2... feel free to @@ -999,6 +990,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, { SOCENOPROTOOPT, ENOPROTOOPT }, { SOCEPROTONOSUPPORT, EPROTONOSUPPORT }, { SOCESOCKTNOSUPPORT, ESOCKTNOSUPPORT }, + { SOCEOPNOTSUPP, EOPNOTSUPP }, { SOCEPFNOSUPPORT, EPFNOSUPPORT }, { SOCEADDRINUSE, EADDRINUSE }, { SOCEADDRNOTAVAIL, EADDRNOTAVAIL }, @@ -1130,8 +1122,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY) #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \ || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) -#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP \ - || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP) #elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */ @@ -1193,8 +1183,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, #define APR_STATUS_IS_ENOTEMPTY(s) ((s) == APR_ENOTEMPTY) #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \ || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT) -#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP \ - || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP) #else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */ @@ -1314,8 +1302,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, (s) == APR_EEXIST) /** Address Family not supported */ #define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT) -/** Socket operation not supported */ -#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP) /** @} */ #endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */ |