rpms/xmbdfed/devel xmbdfed-4.7-getline.patch, NONE, 1.1 xmbdfed.spec, 1.3, 1.4

[Tom Callaway]

Author: spot

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

Modified Files:
	xmbdfed.spec 
Added Files:
	xmbdfed-4.7-getline.patch 
Log Message:
fix getline conflict

xmbdfed-4.7-getline.patch:
 bdfgname.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE xmbdfed-4.7-getline.patch ---
diff -up xmbdfed-4.7/bdfgname.c.getline xmbdfed-4.7/bdfgname.c
--- xmbdfed-4.7/bdfgname.c.getline	2009-08-05 14:16:46.000000000 -0400
+++ xmbdfed-4.7/bdfgname.c	2009-08-05 14:17:16.000000000 -0400
@@ -47,9 +47,9 @@ static unsigned long adobe_names_used;
 
 static int
 #ifdef __STDC__
-getline(FILE *in, char *buf, int limit)
+_bdf_getline(FILE *in, char *buf, int limit)
 #else
-getline(in, buf, limit)
+_bdf_getline(in, buf, limit)
 FILE *in;
 char *buf;
 int limit;
@@ -99,11 +99,11 @@ FILE *in;
 
     while (!feof(in)) {
         pos = ftell(in);
-        (void) getline(in, buf, 256);
+        (void) _bdf_getline(in, buf, 256);
         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
             buf[0] = 0;
             pos = ftell(in);
-            (void) getline(in, buf, 256);
+            (void) _bdf_getline(in, buf, 256);
         }
 
         if (buf[0] == 0)
@@ -170,11 +170,11 @@ FILE *in;
 
     while (!feof(in)) {
         pos = ftell(in);
-        (void) getline(in, buf, 256);
+        (void) _bdf_getline(in, buf, 256);
         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
             buf[0] = 0;
             pos = ftell(in);
-            (void) getline(in, buf, 256);
+            (void) _bdf_getline(in, buf, 256);
         }
 
         c = _bdf_atol(buf, 0, 16);


Index: xmbdfed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmbdfed/devel/xmbdfed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmbdfed.spec	27 Jul 2009 08:09:16 -0000	1.3
+++ xmbdfed.spec	5 Aug 2009 18:21:43 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		xmbdfed
 Summary: 	Bitmap Font Editor
 Version:	4.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	MIT
 Group:		Applications/System
 Source0:	http://crl.nmsu.edu/~mleisher/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source2:	xmbdfed.desktop
 Patch0:		http://crl.nmsu.edu/~mleisher/%{name}-4.7-patch1
 Patch1:		xmbdfed-4.7-linux.patch
 Patch2:		xmbdfed-4.7-staticfix.patch
+Patch3:		xmbdfed-4.7-getline.patch
 URL:		http://crl.nmsu.edu/~mleisher/xmbdfed.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel, lesstif-devel, libXpm-devel, libXmu-devel
@@ -57,6 +58,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xmbdfed*
 
 %changelog
+* Wed Aug  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7-6
+- fix function naming conflict of "getline" with stdio.h
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild