From owner-svn-src-head@freebsd.org  Tue Jun 20 16:40:33 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23CBDD9CB1D;
 Tue, 20 Jun 2017 16:40:33 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E5E9665C56;
 Tue, 20 Jun 2017 16:40:32 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KGeWS8026760;
 Tue, 20 Jun 2017 16:40:32 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KGeWMd026759;
 Tue, 20 Jun 2017 16:40:32 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201706201640.v5KGeWMd026759@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 20 Jun 2017 16:40:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320151 - head/contrib/tcp_wrappers
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2017 16:40:33 -0000

Author: avg
Date: Tue Jun 20 16:40:31 2017
New Revision: 320151
URL: https://svnweb.freebsd.org/changeset/base/320151

Log:
  remove bogus declaration of malloc from tcp_wrappers
  
  The declaration was already inactive when INET6 was enabled
  and it causes a build error in the other case because of
  a conflict with the correct definition in stdlib.h.
  
  Discussed with:	dim, ume
  MFC after:	2 weeks

Modified:
  head/contrib/tcp_wrappers/scaffold.c

Modified: head/contrib/tcp_wrappers/scaffold.c
==============================================================================
--- head/contrib/tcp_wrappers/scaffold.c	Tue Jun 20 15:55:15 2017	(r320150)
+++ head/contrib/tcp_wrappers/scaffold.c	Tue Jun 20 16:40:31 2017	(r320151)
@@ -28,10 +28,6 @@ static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 
 #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
 #endif
 
-#ifndef INET6
-extern char *malloc();
-#endif
-
 /* Application-specific. */
 
 #include "tcpd.h"