Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > fb9dc3901070cde3bf3a18dabc0960c9 > files > 1

z88dk-1.9-2.fc12.src.rpm

diff -ur z88dk/src/z80asm/z80pass.c z88dk-1.8-getline-name-conflict/src/z80asm/z80pass.c
--- z88dk/src/z80asm/z80pass.c	2002-05-11 22:09:38.000000000 +0200
+++ z88dk-1.8-getline-name-conflict/src/z80asm/z80pass.c	2009-04-10 02:01:28.000000000 +0200
@@ -94,7 +94,7 @@
 /* local functions */
 void ifstatement (enum flag interpret);
 void parseline (enum flag interpret);
-void getline (void);
+void getasmline (void);
 void Pass2info (struct expr *expression, char constrange, long lfileptr);
 void Z80pass1 (void);
 void Z80pass2 (void);
@@ -165,7 +165,7 @@
 
 
 void 
-getline (void)
+getasmline (void)
 {
   long fptr;
   int l,c;
@@ -198,7 +198,7 @@
       ++CURRENTFILE->line;
       ++TOTALLINES;
       if (listing)
-	getline ();		/* get a copy of current source line */
+	getasmline ();		/* get a copy of current source line */
 
       EOL = OFF;		/* reset END OF LINE flag */
       GetSym ();