Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1587750 - in /apr/apr/branches/1.5.x: ./
 include/apr_errno.h
Date: Tue, 15 Apr 2014 23:22:29 -0000
To: commits@apr.apache.org
From: trawick@apache.org
Message-Id: <20140415232229.A27952388868@eris.apache.org>

Author: trawick
Date: Tue Apr 15 23:22:29 2014
New Revision: 1587750

URL: http://svn.apache.org/r1587750
Log:
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

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/include/apr_errno.h

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Reverse-merged /apr/apr/trunk:r1561040

Modified: apr/apr/branches/1.5.x/include/apr_errno.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_errno.h?rev=1587750&r1=1587749&r2=1587750&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_errno.h (original)
+++ apr/apr/branches/1.5.x/include/apr_errno.h Tue Apr 15 23:22:29 2014
@@ -833,13 +833,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
 #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_sta
                 || (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_sta
     { SOCENOPROTOOPT,           ENOPROTOOPT     },
     { SOCEPROTONOSUPPORT,       EPROTONOSUPPORT },
     { SOCESOCKTNOSUPPORT,       ESOCKTNOSUPPORT },
+    { SOCEOPNOTSUPP,            EOPNOTSUPP      },
     { SOCEPFNOSUPPORT,          EPFNOSUPPORT    },
     { SOCEADDRINUSE,            EADDRINUSE      },
     { SOCEADDRNOTAVAIL,         EADDRNOTAVAIL   },
@@ -1130,8 +1122,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
                 || (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_sta
 #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_sta
                                           (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) */