Fix a bug in OS2 related to AF_UNSPEC, and drop a NETWARE section that

  duplicates the correct code.  If we need to do something with proto,
  then _that_ can be hidden in an ifdef WIN32


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62610 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c
index 895b778af..1241e678f 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -130,10 +130,10 @@ static void alloc_socket(apr_socket_t **new, apr_pool_t *p)
     (*new)->remote_addr->pool = p;
 }
 
-APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int ofamily, int type,
+APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int family, int type,
                                             apr_pool_t *cont)
 {
-    int family = ofamily;
+    int downgrade = (family == AF_UNSPEC);
 
     if (family == AF_UNSPEC) {
 #if APR_HAVE_IPV6
@@ -152,9 +152,9 @@ APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int ofamily, int
         return APR_ENOMEM;
     }
  
-    (*new)->socketdes = socket(AF_INET, type, 0);
+    (*new)->socketdes = socket(family, type, 0);
 #if APR_HAVE_IPV6
-    if ((*new)->socketdes < 0 && ofamily == AF_UNSPEC) {
+    if ((*new)->socketdes < 0 && downgrade) {
         family = AF_INET;
         (*new)->socketdes = socket(family, type, 0);
     }