svn commit: r415027 - head/lang/hope/files

[Baptiste Daroussin]

Author: bapt
Date: Wed May 11 20:22:07 2016
New Revision: 415027
URL: https://svnweb.freebsd.org/changeset/ports/415027

Log:
  Prevent collision with getline(3)

Added:
  head/lang/hope/files/patch-src_source.c   (contents, props changed)
  head/lang/hope/files/patch-src_source.h   (contents, props changed)
  head/lang/hope/files/patch-src_yylex.c   (contents, props changed)

Added: head/lang/hope/files/patch-src_source.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/hope/files/patch-src_source.c	Wed May 11 20:22:07 2016	(r415027)
@@ -0,0 +1,20 @@
+--- src/source.c.orig	1999-04-09 23:40:26 UTC
++++ src/source.c
+@@ -250,7 +250,7 @@ static	const	char	*const	errname[] = {
+ 		abort();
+ 	if (errtype >= FATALERR) {
+ 		if (gen_listing)	/* copy the rest to the listing */
+-			while (getline())
++			while (get_line())
+ 				;
+ 		(void)exit(1);
+ 	}
+@@ -287,7 +287,7 @@ interactive(void)
+  *	otherwise it ends in a newline (whitespace) and then a null.
+  */
+ global Bool
+-getline(void)
++get_line(void)
+ {
+ 	if (atend && cur_source >= source) {
+ 		if (cur_source > source)

Added: head/lang/hope/files/patch-src_source.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/hope/files/patch-src_source.h	Wed May 11 20:22:07 2016	(r415027)
@@ -0,0 +1,11 @@
+--- src/source.h.orig	1997-06-09 08:02:53 UTC
++++ src/source.h
+@@ -8,7 +8,7 @@ extern	const	Byte	*inptr;
+ extern	void	init_source(FILE *src, Bool gen_listing);
+ extern	void	enterfile(FILE *f);
+ extern	Bool	interactive(void);
+-extern	Bool	getline(void);
++extern	Bool	get_line(void);
+ 
+ #ifdef	RE_EDIT
+ extern	void	set_script(const char *filename);

Added: head/lang/hope/files/patch-src_yylex.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/hope/files/patch-src_yylex.c	Wed May 11 20:22:07 2016	(r415027)
@@ -0,0 +1,11 @@
+--- src/yylex.c.orig	1999-04-09 12:21:08 UTC
++++ src/yylex.c
+@@ -157,7 +157,7 @@ yylex(void)
+ 				inptr = start;
+ 				return ';';
+ 			}
+-			if (! getline())
++			if (! get_line())
+ 				return EOF;
+ 		} else if (IsDigit(c)) {
+ 			/*