rpms/z88dk/devel z88dk-1.8-getline-name-conflict.patch, NONE, 1.1 z88dk.spec, 1.17, 1.18

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7187/devel

Modified Files:
	z88dk.spec 
Added Files:
	z88dk-1.8-getline-name-conflict.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-3
- fix name conflict with the getline function in POSIX 2008

z88dk-1.8-getline-name-conflict.patch:

--- NEW FILE z88dk-1.8-getline-name-conflict.patch ---
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 ();


Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- z88dk.spec	25 Feb 2009 18:28:31 -0000	1.17
+++ z88dk.spec	10 Apr 2009 00:04:22 -0000	1.18
@@ -1,13 +1,14 @@
 Summary: A Z80 cross compiler
 Name: z88dk
 Version: 1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Artistic clarified
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz
 Patch0: z88dk-1.8-makefile-usr-share.patch
 Patch1: z88dk-1.8-makefile-fixes.patch
 Patch2: z88dk-1.7-64bit.patch
+Patch3: z88dk-1.8-getline-name-conflict.patch
 URL: http://z88dk.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,8 @@
 %patch1 -p1
 # 64-bit fixes
 %patch2 -p1
+# Fix name conflict with the getline function in POSIX 2008
+%patch3 -p1
 %{_bindir}/find . -depth -name CVS -type d -exec %{__rm} -rf {} \;
 # Separate manpages from other docs and fix their permissions
 %{__mv} doc/netman .
@@ -77,6 +80,9 @@
 %{_mandir}/man3z/
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-3
+- fix name conflict with the getline function in POSIX 2008
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild