--- src/nameinfo.c.dist	Sat Mar  2 17:31:18 2002
+++ src/nameinfo.c	Sun Mar  3 16:14:51 2002
@@ -470,7 +470,7 @@
 char *sockaddr_ntop(struct sockaddr *sa)
 
 { 
-#ifdef HAVE_GETADDRINFO 
+#if defined(HAVE_GETADDRINFO) && !defined(DARWIN)
  static char addrbuf[INET6_ADDRSTRLEN];
  void *addr;
 #else
@@ -485,7 +485,7 @@
        sprintf(addrbuf,"%.19s",inet_ntoa(((struct sockaddr_in *)sa)->sin_addr));
        break;
        
-#ifdef HAVE_GETADDRINFO
+#if defined(HAVE_GETADDRINFO) && !defined(DARWIN)
    case AF_INET6:
        Debug("IPV6 address\n");
        addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
--- src/proto.c.dist	Wed Feb 20 03:01:30 2002
+++ src/proto.c	Sun Mar  3 16:15:35 2002
@@ -98,7 +98,7 @@
     {
     case AF_INET: len = sizeof(struct sockaddr_in);
 	break;
-#ifdef HAVE_GETADDRINFO
+#if defined(HAVE_GETADDRINFO) && !defined(DARWIN)
     case AF_INET6: len = sizeof(struct sockaddr_in6);
 	break;
 #endif
@@ -116,7 +116,7 @@
 
 Debug("Identifying this agent as %s i.e. %s, with signature %d\n",localip,VFQNAME,CFSIGNATURE);
 
-#ifdef HAVE_GETADDRINFO
+#if defined(HAVE_GETADDRINFO) && !defined(DARWIN)
 
 if (getnameinfo((struct sockaddr *)&myaddr,sizeof(myaddr),dnsname,maxvarsize,NULL,0,0) != 0)
    {