From 2437a0a93a6a08861709777666895991e4fbd99b Mon Sep 17 00:00:00 2001
From: kvigor <kvigor@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 2 Oct 2000 19:33:44 +0000
Subject: [PATCH] minor cleanup: rename link() to link_main() to avoid conflict
 with unistd.h; #include unistd.h to get proto for unlink()

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@442 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 as/mcs51/aslink.h |  2 +-
 as/mcs51/lklibr.c |  4 ++--
 as/mcs51/lkmain.c | 13 +++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/as/mcs51/aslink.h b/as/mcs51/aslink.h
index b0c9a969..ba85dcb7 100644
--- a/as/mcs51/aslink.h
+++ b/as/mcs51/aslink.h
@@ -633,7 +633,7 @@ extern	VOID		bassav();
 extern	VOID		gblsav();
 extern	VOID		iramsav();
 extern	VOID		iramcheck();
-extern	VOID		link();
+extern	VOID		link_main();
 extern	VOID		lkexit();
 extern	int		main();
 extern	VOID		map();
diff --git a/as/mcs51/lklibr.c b/as/mcs51/lklibr.c
index 7be36101..a6a549a7 100644
--- a/as/mcs51/lklibr.c
+++ b/as/mcs51/lklibr.c
@@ -524,7 +524,7 @@ library()
  *		int	fclose()	c_library
  *		int	fgets()		c_library
  *		FILE *	fopen()		c_library
- *		VOID	link()		lkmain.c
+ *		VOID	link_main()	lkmain.c
  *		int	strlen()	c_library
  *
  *	side effects:
@@ -546,7 +546,7 @@ char *filspc;
 			if (str[i] == '\n')
 				str[i] = '\0';
 			ip = str;
-			link();
+			link_main();
 		}
 		fclose(fp);
 	}
diff --git a/as/mcs51/lkmain.c b/as/mcs51/lkmain.c
index 21ae1661..6de6fb99 100644
--- a/as/mcs51/lkmain.c
+++ b/as/mcs51/lkmain.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <alloc.h>
+#include <unistd.h>
 #include "aslink.h"
 
 
@@ -32,7 +33,7 @@
  *		FILE *	afile(fn,ft,wf)
  *		VOID	bassav()
  *		VOID	gblsav()
-  *		VOID	link()
+  *		VOID	link_main()
  *		VOID	lkexit()
  *		VOID	main(argc,argv)
  *		VOID	map()
@@ -111,7 +112,7 @@
  *		int	fprintf()	c_library
  *		int	getline()	lklex.c
  *		VOID	library()	lklibr.c
- *		VOID	link()		lkmain.c
+ *		VOID	link_main()	lkmain.c
  *		VOID	lkexit()	lkmain.c
  *		VOID	lnkarea()	lkarea.c
  *		VOID	map()		lkmain.c
@@ -227,7 +228,7 @@ char *argv[];
                         if ((ip[0] == ';') && (ip[1] == '!') && jfp) {
                         	fprintf( jfp, "%s\n", &ip[2] );
                         }
-			link();
+			link_main();
 		}
 		if (pass == 0) {
 			/*
@@ -348,9 +349,9 @@ int i;
 	exit(i);
 }
 
-/*)Function	link()
+/*)Function	link_main()
  *
- *	The function link() evaluates the directives for each line of
+ *	The function link_main() evaluates the directives for each line of
  *	text read from the .rel file(s).  The valid directives processed
  *	are:
  *		X, D, Q, H, M, A, S, T, R, and P.
@@ -380,7 +381,7 @@ int i;
  */
 
 VOID
-link()
+link_main()
 {
 	register int c;
 
-- 
2.47.2