1 files changed, 1 insertions, 24 deletions

diff --git a/src/lib/libc/net/getnameinfo.c b/src/lib/libc/net/getnameinfo.c
index 000ce85523..8b2ca299ef 100644
--- a/src/lib/libc/net/getnameinfo.c
+++ b/src/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnameinfo.c,v 1.6 2000/01/05 04:50:48 itojun Exp $  */
+/*      $OpenBSD: getnameinfo.c,v 1.7 2000/01/17 08:15:27 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -39,14 +39,7 @@
  *   modified).
  */
 
-#if 0
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif 
-#else
-#define HAVE_SA_LEN
 #define INET6
-#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -59,16 +52,6 @@
 #include <string.h>
 #include <stddef.h>
 
-#if 0
-#ifndef HAVE_PORTABLE_PROTOTYPE
-#include "cdecl_ext.h"
-#endif 
-
-#ifndef HAVE_ADDRINFO
-#include "addrinfo.h"
-#endif
-#endif
-
 #define SUCCESS 0
 #define ANY 0
 #define YES 1
@@ -127,10 +110,8 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
         if (sa == NULL)
                 return ENI_NOSOCKET;
 
-#ifdef HAVE_SA_LEN      /*XXX*/
         if (sa->sa_len != salen)
                 return ENI_SALEN;
-#endif
         
         family = sa->sa_family;
         for (i = 0; afdl[i].a_af; i++)
@@ -180,11 +161,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                 if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
                         flags |= NI_NUMERICHOST;
                 v4a >>= IN_CLASSA_NSHIFT;
-#if 0
-                if (v4a == 0 || v4a == IN_LOOPBACKNET)
-#else
                 if (v4a == 0)
-#endif
                         flags |= NI_NUMERICHOST;                        
                 break;
 #ifdef INET6