From owner-svn-ports-all@freebsd.org Wed Feb 1 20:21:30 2017 Return-Path: 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 5095ECCC71C; Wed, 1 Feb 2017 20:21:30 +0000 (UTC) (envelope-from jbeich@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 1E3FA889; Wed, 1 Feb 2017 20:21:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v11KLTLP065543; Wed, 1 Feb 2017 20:21:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11KLTcg065542; Wed, 1 Feb 2017 20:21:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702012021.v11KLTcg065542@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 1 Feb 2017 20:21:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433093 - head/mail/pop3vscan/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.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 20:21:30 -0000 Author: jbeich Date: Wed Feb 1 20:21:29 2017 New Revision: 433093 URL: https://svnweb.freebsd.org/changeset/ports/433093 Log: mail/pop3vscan: unbreak on 12.0 after base r303524 gcc49 -Wall -O2 -I/usr/local/include -DPREFIX=\"/usr/local\" -c getline.c In file included from getline.c:38:0: getline.h:74:5: error: conflicting types for 'getline' int getline(int fd, struct linebuf * l); ^ In file included from getline.c:30:0: /usr/local/lib/gcc49/gcc/x86_64-portbld-freebsd12.0/4.9.4/include-fixed/stdio.h:375:10: note: previous declaration of 'getline' was here ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict); ^ getline.c:67:5: error: conflicting types for 'getline' int getline(int fd, struct linebuf * l){ ^ In file included from getline.c:30:0: /usr/local/lib/gcc49/gcc/x86_64-portbld-freebsd12.0/4.9.4/include-fixed/stdio.h:375:10: note: previous declaration of 'getline' was here ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict); ^ Reported by: pkg-fallout Added: head/mail/pop3vscan/files/patch-getline.h (contents, props changed) Added: head/mail/pop3vscan/files/patch-getline.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/pop3vscan/files/patch-getline.h Wed Feb 1 20:21:29 2017 (r433093) @@ -0,0 +1,10 @@ +--- getline.h.orig 2002-06-12 00:19:05 UTC ++++ getline.h +@@ -71,6 +71,7 @@ typedef struct linebuf { + * You can call getline again, but it will return + * the rest of that line and not the next one! + */ ++#define getline folke_getline + int getline(int fd, struct linebuf * l); + + /* writes line to fd