Prevent collision on getline(3)

While here regen patches

1 files changed, 31 insertions, 4 deletions

diff --git a/math/physcalc/files/patch-physconv.c b/math/physcalc/files/patch-physconv.c
index 179a6a6b4eac..40e475670ce3 100644
--- a/math/physcalc/files/patch-physconv.c
+++ b/math/physcalc/files/patch-physconv.c
@@ -1,6 +1,24 @@
---- physconv.c.orig	1998-08-30 15:58:16.000000000 -0500
-+++ physconv.c	2009-06-25 22:22:21.000000000 -0500
-@@ -260,12 +260,16 @@
+--- physconv.c.orig	1998-08-30 13:58:16 UTC
++++ physconv.c
+@@ -32,7 +32,7 @@
+ #include "physdecl.h"
+ 
+ #ifdef __PROTOTYPES__
+-LOCAL void getline(FILE *fp, char *buf);
++LOCAL void get_line(FILE *fp, char *buf);
+ LOCAL int evalxpon(char *s);
+ LOCAL void fixplural(char *s);
+ LOCAL int output_dims(FILE *fp, int const d[MAXDIM]);
+@@ -86,7 +86,7 @@ EXPORT struct dimstruct *dimension_list=
+ 
+ /*-----Functions-----*/
+ 
+-LOCAL void getline(fp,buf)	/* Get a line from the file & doctor it up */
++LOCAL void get_line(fp,buf)	/* Get a line from the file & doctor it up */
+ FILE *fp;
+ char *buf;
+ {
+@@ -260,12 +260,16 @@ char const *s;
  {	/* read in lines from fp and do each as if typed from console */
  	FILE *fp;
  	char buf[SMALLBUF];
@@ -18,7 +36,16 @@
  		printf("Can't open %s\n",s);
  		return;
  	}
-@@ -797,7 +801,7 @@
+@@ -276,7 +280,7 @@ char const *s;
+ #endif
+ 	echo = FALSE;
+ 	while (TRUE) {
+-		getline(fp,buf);
++		get_line(fp,buf);
+ 		if (!buf[0])
+ 			break;
+ 		do_cmd(buf);
+@@ -797,7 +801,7 @@ char const *s;
  				} else {
  					showdims(&d);
  					printf("Convert to: ");