Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 20:21:29 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433093 - head/mail/pop3vscan/files
Message-ID:  <201702012021.v11KLTcg065542@repo.freebsd.org>

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



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