rpms/slang/devel slang-1.4.9-gcc4.patch, NONE, 1.1 slang.spec, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27931

Modified Files:
	slang.spec 
Added Files:
	slang-1.4.9-gcc4.patch 
Log Message:
* Fri Mar 18 2005 Petr Rockai <prockai at redhat.com> - 1.4.9-17
- Patch to compile with gcc4 by Robert Scheck (#151029).


slang-1.4.9-gcc4.patch:
 slposio.c |    2 +-
 sltoken.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE slang-1.4.9-gcc4.patch ---
Patch by Robert Scheck <redhat at linuxnetz.de> for slang >= 1.4.9, which 
makes slang rebuildable using gcc 4.

--- slang-1.4.9/src/sltoken.c		2003-03-23 08:06:40.000000000 +0100
+++ slang-1.4.9/src/sltoken.c.gcc4	2005-03-14 09:01:16.000000000 +0100
@@ -789,7 +789,7 @@
 #if _SLANG_HAS_DEBUG_CODE
 	     tok->line_number++;
 #endif
-	     Input_Line = LLT->read(LLT);
+	     Input_Line = (LLT->read) (LLT);
 	     if ((NULL == Input_Line) || SLang_Error)
 	       {
 		  Input_Line_Pointer = Input_Line = NULL;
@@ -1185,7 +1185,7 @@
 	  {
 	   case '\n':
 	   case 0:
-	     if (NULL == (Input_Line = LLT->read(LLT)))
+	     if (NULL == (Input_Line = (LLT->read) (LLT)))
 	       {
 		  Input_Line_Pointer = Input_Line = NULL;
 		  return;
--- slang-1.4.9/src/slposio.c		2003-03-23 08:06:40.000000000 +0100
+++ slang-1.4.9/src/slposio.c.gcc4	2005-03-14 09:03:00.000000000 +0100
@@ -166,7 +166,7 @@
        || (NULL == (b = SLmalloc (len + 1))))
      goto return_error;
    
-   if (-1 == f->read (f->fd, b, &len))
+   if (-1 == (f->read) (f->fd, b, &len))
      {
 	_SLerrno_errno = errno;
 	goto return_error;


Index: slang.spec
===================================================================
RCS file: /cvs/dist/rpms/slang/devel/slang.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- slang.spec	2 Mar 2005 14:20:42 -0000	1.21
+++ slang.spec	18 Mar 2005 07:16:02 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: slang
 Version: 1.4.9
-Release: 16
+Release: 17
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 Patch2: slang-utf8-acs.patch
 Patch3: slang-1.4.5-utf8-segv.patch
 Patch4: slang-utf8-fix.patch
+Patch5: slang-1.4.9-gcc4.patch
 Url: http://www.s-lang.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libtool, libtermcap-devel
@@ -44,6 +45,7 @@
 %patch2 -p1 -b .acs
 %patch3 -p1 -b .segv
 %patch4 -p1 -b .utf8-fix
+%patch5 -p1 -b .gcc4
 
 cp %{SOURCE2} .
 
@@ -86,6 +88,11 @@
 %{_includedir}/slang
 
 %changelog
+* Fri Mar 18 2005 Petr Rockai <prockai at redhat.com> - 1.4.9-17
+- Patch to compile with gcc4 by Robert Scheck (#151029). (Weeird,
+  probably on march 2nd the used buildroot wasn't updated with
+  gcc4 yet?).
+
 * Wed Mar 02 2005 Petr Rockai <prockai at redhat.com>
 - rebuild