Author: matthew Date: 2005-08-30 14:31:27 -0600 (Tue, 30 Aug 2005) New Revision: 1088
Added: trunk/inetutils/inetutils-1.4.2-gcc4_fixes-3.patch Log: Added new version of the inetutils gcc4 patch to reflect the accepted upstream fix Added: trunk/inetutils/inetutils-1.4.2-gcc4_fixes-3.patch =================================================================== --- trunk/inetutils/inetutils-1.4.2-gcc4_fixes-3.patch 2005-08-29 16:08:52 UTC (rev 1087) +++ trunk/inetutils/inetutils-1.4.2-gcc4_fixes-3.patch 2005-08-30 20:31:27 UTC (rev 1088) @@ -0,0 +1,37 @@ +Submitted By: Matthew Burgess <[EMAIL PROTECTED]> +Date: 2005-08-30 +Initial Package Version: 1.4.2 +Upstream Status: From upstream +Origin: Greg Schafer <[EMAIL PROTECTED]> (http://www.diy-linux.org/downloads/patches/GCC4/inetutils-1.4.2-gcc4-fixes-1.patch) +Description: Fix compilation issues with gcc4 + +diff -Naur inetutils-1.4.2.orig/ftp/ftp_var.h inetutils-1.4.2/ftp/ftp_var.h +--- inetutils-1.4.2.orig/ftp/ftp_var.h 2000-07-08 01:00:53.000000000 +0000 ++++ inetutils-1.4.2/ftp/ftp_var.h 2005-08-30 20:25:27.205932304 +0000 +@@ -36,8 +36,6 @@ + #include <sys/param.h> + #include <setjmp.h> + +-#include "extern.h" +- + #ifndef FTP_EXTERN + #define FTP_EXTERN extern + #endif +@@ -129,3 +127,5 @@ + FTP_EXTERN int macnum; /* number of defined macros */ + FTP_EXTERN struct macel macros[16]; + FTP_EXTERN char macbuf[4096]; ++ ++#include "extern.h" +diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c +--- inetutils-1.4.2.orig/libinetutils/ttymsg.c 2001-11-01 15:52:19.000000000 +0000 ++++ inetutils-1.4.2/libinetutils/ttymsg.c 2005-08-30 20:24:27.168059448 +0000 +@@ -132,7 +132,7 @@ + } + if (wret) + { +- (char *)iov->iov_base += wret; ++ iov->iov_base = (char *)iov->iov_base + wret; + iov->iov_len -= wret; + } + continue; -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
