From owner-svn-ports-all@freebsd.org  Fri Jul 29 23:10:18 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 2BEC9BA7371;
 Fri, 29 Jul 2016 23:10:18 +0000 (UTC)
 (envelope-from bapt@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 DF5CB1AE6;
 Fri, 29 Jul 2016 23:10:17 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6TNAHvh014569;
 Fri, 29 Jul 2016 23:10:17 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6TNAHDu014567;
 Fri, 29 Jul 2016 23:10:17 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201607292310.u6TNAHDu014567@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 29 Jul 2016 23:10:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419274 - head/audio/raop_play/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jul 2016 23:10:18 -0000

Author: bapt
Date: Fri Jul 29 23:10:16 2016
New Revision: 419274
URL: https://svnweb.freebsd.org/changeset/ports/419274

Log:
  Prevent collision with getline(3)

Modified:
  head/audio/raop_play/files/getline.c
  head/audio/raop_play/files/getline.h

Modified: head/audio/raop_play/files/getline.c
==============================================================================
--- head/audio/raop_play/files/getline.c	Fri Jul 29 23:02:48 2016	(r419273)
+++ head/audio/raop_play/files/getline.c	Fri Jul 29 23:10:16 2016	(r419274)
@@ -155,7 +155,7 @@ getstr (lineptr, n, stream, terminator, 
 }
 
 int
-getline (lineptr, n, stream)
+get_line (lineptr, n, stream)
      char **lineptr;
      size_t *n;
      FILE *stream;

Modified: head/audio/raop_play/files/getline.h
==============================================================================
--- head/audio/raop_play/files/getline.h	Fri Jul 29 23:02:48 2016	(r419273)
+++ head/audio/raop_play/files/getline.h	Fri Jul 29 23:10:16 2016	(r419274)
@@ -13,7 +13,7 @@
 
 #ifndef _WITH_GETLINE
 int
-  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+  get_line __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
 int
   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
                          int limit));