From 1f6f478ebf8fd533e2819f9558e90de1b6bee503 Mon Sep 17 00:00:00 2001
From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 7 Feb 2006 15:53:40 +0000
Subject: [PATCH] * link/z80/lkmain.c, * link/z80/lklex.c, * link/z80/lkdata.c,
 * link/z80/aslink.h: fixed build on current cygwin: replaced getline() by
 lk_getline()

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4031 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 link/z80/aslink.h |  4 ++--
 link/z80/lkdata.c |  2 +-
 link/z80/lklex.c  | 10 +++++-----
 link/z80/lkmain.c |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/link/z80/aslink.h b/link/z80/aslink.h
index 939e7437..fabdb1c3 100644
--- a/link/z80/aslink.h
+++ b/link/z80/aslink.h
@@ -485,7 +485,7 @@ extern	char	ccase[];	/*	an array of characters which
 extern	struct	lfile	*filep;	/*	The pointers (lfile *) filep,
 				 *	(lfile *) cfp, and (FILE *) sfp
 				 *	are used in conjunction with
-				 *	the routine getline() to read
+				 *	the routine lk_getline() to read
 				 *	asmlnk commands from
 				 *	(1) the standard input or
 				 *	(2) or a command file
@@ -649,7 +649,7 @@ extern	char		endline();
 extern	char		get();
 extern	VOID		getfid();
 extern	VOID		getid();
-extern	int		getline();
+extern	int		lk_getline();
 extern	int		getmap();
 extern	char		getnb();
 extern	int		more();
diff --git a/link/z80/lkdata.c b/link/z80/lkdata.c
index 672612af..3d075b7d 100644
--- a/link/z80/lkdata.c
+++ b/link/z80/lkdata.c
@@ -102,7 +102,7 @@ int	gcntr;		/*	LST file relocation active
 struct	lfile	*filep;	/*	The pointers (lfile *) filep,
 			 *	(lfile *) cfp, and (FILE *) sfp
 			 *	are used in conjunction with
-			 *	the routine getline() to read
+			 *	the routine lk_getline() to read
 			 *	asmlnk commands from
 			 *	(1) the standard input or
 			 *	(2) or a command file
diff --git a/link/z80/lklex.c b/link/z80/lklex.c
index 7bc34fca..1ccdeea8 100644
--- a/link/z80/lklex.c
+++ b/link/z80/lklex.c
@@ -28,7 +28,7 @@
  *		char	get()
  *		VOID	getfid()
  *		VOID	getid()
- *		int	getline()
+ *		int	lk_getline()
  *		int	getmap()
  *		char	getnb()
  *		int	more()
@@ -370,15 +370,15 @@ getmap(d)
 	return (c);
 }
 
-/*)Function	int	getline()
+/*)Function	int	lk_getline()
  *
- *	The function getline() reads a line of input text from a
+ *	The function lk_getline() reads a line of input text from a
  *	.rel source text file, a .lnk command file or from stdin.
  *	Lines of text are processed from a single .lnk file or
  *	multiple .rel files until all files have been read.
  *	The input text line is copied into the global string ib[]
  *	and converted to a NULL terminated string.  The function
- *	getline() returns a (1) after succesfully reading a line
+ *	lk_getline() returns a (1) after succesfully reading a line
  *	or a (0) if all files have been read.
  *	This function also opens each input .lst file and output
  *	.rst file as each .rel file is processed.
@@ -424,7 +424,7 @@ getmap(d)
  */
 
 int
-getline()
+lk_getline()
 {
 	register int i, ftype;
 	register char *fid;
diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index e4554add..f2d071e2 100644
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -83,7 +83,7 @@ void Timer(int action, char * message)
  *
  *	The function main() evaluates the command line arguments to
  *	determine if the linker parameters are to input through 'stdin'
- *	or read from a command file.  The functiond getline() and parse()
+ *	or read from a command file.  The functiond lk_getline() and parse()
  *	are to input and evaluate the linker parameters.  The linking process
  *	proceeds by making the first pass through each .rel file in the order
  *	presented to the linker.  At the end of the first pass the setbase(),
@@ -137,7 +137,7 @@ void Timer(int action, char * message)
  *		FILE *	afile()		lkmain.c
  *		int	fclose()	c_library
  *		int	fprintf()	c_library
- *		int	getline()	lklex.c
+ *		int	lk_getline()	lklex.c
  *		VOID	library()	lklibr.c
  *		VOID	link()		lkmain.c
  *		VOID	lkexit()	lkmain.c
@@ -285,7 +285,7 @@ char *argv[];
 	filep = startp;
 	while (1) {
 		ip = ib;					
-		if (getline() == 0)
+		if (lk_getline() == 0)
 			break;
 		if (pflag && sfp != stdin)
 			fprintf(stdout, "%s\n", ip);
@@ -328,7 +328,7 @@ char *argv[];
 		hp = NULL;
 		radix = 10;
 
-		while (getline()) {
+		while (lk_getline()) {
 			ip = ib;
 			link();
 		}
-- 
2.30.2