From owner-p4-projects@FreeBSD.ORG  Tue Feb 22 16:06:18 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24E651065674; Tue, 22 Feb 2011 16:06:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBBB5106566B
	for <perforce@freebsd.org>; Tue, 22 Feb 2011 16:06:17 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C862D8FC19
	for <perforce@freebsd.org>; Tue, 22 Feb 2011 16:06:17 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p1MG6HKt028268
	for <perforce@freebsd.org>; Tue, 22 Feb 2011 16:06:17 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1MG6H02028265
	for perforce@freebsd.org; Tue, 22 Feb 2011 16:06:17 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 22 Feb 2011 16:06:17 GMT
Message-Id: <201102221606.p1MG6H02028265@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 189034 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Feb 2011 16:06:18 -0000

http://p4web.freebsd.org/@@189034?ac=10

Change 189034 by jhb@jhb_jhbbsd on 2011/02/22 16:05:23

	Don't use getline() stub on newer FreeBSD versions.

Affected files ...

.. //depot/projects/mcelog/config.c#3 edit

Differences ...

==== //depot/projects/mcelog/config.c#3 (text) ====

@@ -18,6 +18,9 @@
    Author: Andi Kleen 
 */
 #define _GNU_SOURCE 1
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -126,11 +129,8 @@
 	return s;
 }
 
-#ifdef __FreeBSD__
-/*
- * Newer versions do have getline(), so this should use a version test
- * at some point.
- */
+#if defined(__FreeBSD__) && __FreeBSD_version < 800067
+/* Provide a stub getline() for older versions of FreeBSD. */
 static ssize_t getline(char **cp, size_t *lenp, FILE *f)
 {