From owner-svn-src-all@FreeBSD.ORG  Mon Jul  2 09:25:08 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D58E4106564A;
	Mon,  2 Jul 2012 09:25:08 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C1A598FC19;
	Mon,  2 Jul 2012 09:25:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q629P8Om060527;
	Mon, 2 Jul 2012 09:25:08 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q629P8dX060525;
	Mon, 2 Jul 2012 09:25:08 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201207020925.q629P8dX060525@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 2 Jul 2012 09:25:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237984 - stable/9/lib/libmagic
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 09:25:09 -0000

Author: obrien
Date: Mon Jul  2 09:25:08 2012
New Revision: 237984
URL: http://svn.freebsd.org/changeset/base/237984

Log:
  Allow building on FreeBSD 7.
  
  Note that "HAVE_GETLINE" should be #undef'ed in config.h as were not using
  the libc interface -- however that leads to redundant redeclaration compiler
  warnings between the internal file.h and <stdio.h>.

Modified:
  stable/9/lib/libmagic/Makefile

Modified: stable/9/lib/libmagic/Makefile
==============================================================================
--- stable/9/lib/libmagic/Makefile	Mon Jul  2 08:48:58 2012	(r237983)
+++ stable/9/lib/libmagic/Makefile	Mon Jul  2 09:25:08 2012	(r237984)
@@ -13,6 +13,7 @@ MAN=	libmagic.3 magic.5
 SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \
 	encoding.c fsmagic.c funcs.c \
 	is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
+SRCS+=	getline.c
 INCS=	magic.h
 
 MAGICPATH?=	/usr/share/misc