From 70edeb56b4fb87bd151e13135b21183fdf6a17e4 Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 1 Feb 2017 20:21:29 +0000 Subject: 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 --- mail/pop3vscan/files/patch-getline.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mail/pop3vscan/files/patch-getline.h (limited to 'mail') diff --git a/mail/pop3vscan/files/patch-getline.h b/mail/pop3vscan/files/patch-getline.h new file mode 100644 index 000000000000..d94e3705d4b7 --- /dev/null +++ b/mail/pop3vscan/files/patch-getline.h @@ -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 -- cgit