minor cleanup: rename link() to link_main() to avoid conflict with unistd.h; #include...

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@442 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/as/mcs51/aslink.h b/as/mcs51/aslink.h
index b0c9a969a1186d0a7eb57b5ea496337dfd633534..ba85dcb750a974cb19a67146809767fc1fb768f4 100644 (file)
--- 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 7be3610172c2cf3f93eb4b6fb9747ee44c0f1c8f..a6a549a78d201287d229ccb94a745a653c172972 100644 (file)
--- 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 21ae166108dd81fa62b6647da6b5a85406bbf0a4..6de6fb99080134c885e519b94384db1339f45a2e 100644 (file)
--- 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;