From owner-freebsd-current@FreeBSD.ORG Wed Dec 24 19:54:04 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D743E16A4CE for ; Wed, 24 Dec 2003 19:54:04 -0800 (PST) Received: from mhub-c6.tc.umn.edu (mhub-c6.tc.umn.edu [160.94.128.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id B519743D46 for ; Wed, 24 Dec 2003 19:54:03 -0800 (PST) (envelope-from ryans@gamersimpact.com) Received: from [24.107.70.120] by mhub-c6.tc.umn.edu with ESMTP for freebsd-current@freebsd.org; Wed, 24 Dec 2003 21:54:03 -0600 From: Ryan Sommers To: freebsd-current@freebsd.org Content-Type: multipart/mixed; boundary="=-oFPkL/xjN6LzQDEqdTsU" Message-Id: <1072324229.662.18.camel@localhost> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 Date: Wed, 24 Dec 2003 21:50:29 -0600 Subject: EAI_NODATA redefined Patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2003 03:54:05 -0000 --=-oFPkL/xjN6LzQDEqdTsU Content-Type: text/plain Content-Transfer-Encoding: 7bit Attached is a patch to get rid of the "EAI_NODATA redefined" errors in buildworld. The Makefile lists no MAINTAINER but I know this is contrib software. Should I submit this as a PR or who is the MAINTAINER? -- Ryan "leadZERO" Sommers ryans@gamersimpact.com --=-oFPkL/xjN6LzQDEqdTsU Content-Disposition: attachment; filename=roken-common.h.diff Content-Type: text/x-patch; name=roken-common.h.diff; charset= Content-Transfer-Encoding: 7bit --- /usr/src/crypto/heimdal/lib/roken/roken-common.h Wed Dec 24 20:06:14 2003 +++ /usr/src/crypto/heimdal/lib/roken/roken-common.h Wed Dec 24 21:00:10 2003 @@ -172,6 +172,14 @@ #define EAI_NOERROR 0 /* no error */ #endif +/* XXX - EAI_NODATA is marked to be removed from in Apr 2004 + * check back here then to see if this is still needed */ + +#ifdef EAI_NODATA +#undef EAI_NODATA +#endif +#define EAI_NODATA 7 /* no address associated with nodename */ + #ifndef EAI_ADDRFAMILY #define EAI_ADDRFAMILY 1 /* address family for nodename not supported */ @@ -180,7 +188,7 @@ #define EAI_FAIL 4 /* non-recoverable failure in name resolution */ #define EAI_FAMILY 5 /* ai_family not supported */ #define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with nodename */ +# define EAI_NODATA 7 /* no address associated with nodename */ #define EAI_NONAME 8 /* nodename nor servname provided, or not known */ #define EAI_SERVICE 9 /* servname not supported for ai_socktype */ #define EAI_SOCKTYPE 10 /* ai_socktype not supported */ --=-oFPkL/xjN6LzQDEqdTsU--