* 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

diff --git a/link/z80/aslink.h b/link/z80/aslink.h
index 939e7437f3bd7871b76d9e1af5adc04a0c11a97d..fabdb1c3631894744ed20b44cc336346a2c4ba01 100644 (file)
--- 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 672612afa2cf6ddc8865ad915ce584372bfc47d9..3d075b7db164473de756a68533245c2bb51c2ead 100644 (file)
--- 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 7bc34fcaa34a6655e9fd0c1b8bfd414ba1a9f1d7..1ccdeea8b375bfd4486e9bdef956b4131e3821b1 100644 (file)
--- 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 e4554add09700e0684a4098735dfbff6e5ee7c57..f2d071e253bddbf0bd7dabef4feb03260a66e2f9 100644 (file)
--- 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();
                }