Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Jun 2017 16:40:32 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r320151 - head/contrib/tcp_wrappers
Message-ID:  <201706201640.v5KGeWMd026759@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706201640.v5KGeWMd026759>