Annotation of /trunk/inetutils/patches/inetutils-1.4.2-gcc4_fixes-3.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1295 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1295 byte(s)
-import
1 | niro | 144 | Submitted By: Matthew Burgess <matthew@linuxfromscratch.org> |
2 | Date: 2005-08-30 | ||
3 | Initial Package Version: 1.4.2 | ||
4 | Upstream Status: From upstream | ||
5 | Origin: Greg Schafer <gschafer@zip.com.au> (http://www.diy-linux.org/downloads/patches/GCC4/inetutils-1.4.2-gcc4-fixes-1.patch) | ||
6 | Description: Fix compilation issues with gcc4 | ||
7 | |||
8 | diff -Naur inetutils-1.4.2.orig/ftp/ftp_var.h inetutils-1.4.2/ftp/ftp_var.h | ||
9 | --- inetutils-1.4.2.orig/ftp/ftp_var.h 2000-07-08 01:00:53.000000000 +0000 | ||
10 | +++ inetutils-1.4.2/ftp/ftp_var.h 2005-08-30 20:25:27.205932304 +0000 | ||
11 | @@ -36,8 +36,6 @@ | ||
12 | #include <sys/param.h> | ||
13 | #include <setjmp.h> | ||
14 | |||
15 | -#include "extern.h" | ||
16 | - | ||
17 | #ifndef FTP_EXTERN | ||
18 | #define FTP_EXTERN extern | ||
19 | #endif | ||
20 | @@ -129,3 +127,5 @@ | ||
21 | FTP_EXTERN int macnum; /* number of defined macros */ | ||
22 | FTP_EXTERN struct macel macros[16]; | ||
23 | FTP_EXTERN char macbuf[4096]; | ||
24 | + | ||
25 | +#include "extern.h" | ||
26 | diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c | ||
27 | --- inetutils-1.4.2.orig/libinetutils/ttymsg.c 2001-11-01 15:52:19.000000000 +0000 | ||
28 | +++ inetutils-1.4.2/libinetutils/ttymsg.c 2005-08-30 20:24:27.168059448 +0000 | ||
29 | @@ -132,7 +132,7 @@ | ||
30 | } | ||
31 | if (wret) | ||
32 | { | ||
33 | - (char *)iov->iov_base += wret; | ||
34 | + iov->iov_base = (char *)iov->iov_base + wret; | ||
35 | iov->iov_len -= wret; | ||
36 | } | ||
37 | continue; |