소스 검색

fix two gcc hickups, that eventually depend on gcc4 ?

Thorsten Hohmeier 20 년 전
부모
커밋
c23f0f020c
2개의 변경된 파일65개의 추가작업 그리고 1개의 파일을 삭제
  1. 64 0
      inetutils/inetutils.patch
  2. 1 1
      inetutils/inetutils.spec

+ 64 - 0
inetutils/inetutils.patch

@@ -64,3 +64,67 @@
  
  /*
   * p_error prints the system error message on the standard location
+Index: libinetutils/ttymsg.c
+--- libinetutils/ttymsg.c.orig	2001-11-01 16:52:19 +0100
++++ libinetutils/ttymsg.c	2006-01-23 11:52:04 +0100
+@@ -132,7 +132,7 @@
+ 	    }
+ 	  if (wret)
+ 	    {
+-	      (char *)iov->iov_base += wret;
++	      iov->iov_base += wret;
+ 	      iov->iov_len -= wret;
+ 	    }
+ 	  continue;
+Index: ftp/ftp_var.h
+--- ftp/ftp_var.h.orig	2000-07-08 03:00:53 +0200
++++ ftp/ftp_var.h	2006-01-23 14:39:09 +0100
+@@ -36,6 +36,24 @@
+ #include <sys/param.h>
+ #include <setjmp.h>
+ 
++/*
++ * Format of command table.
++ */
++struct cmd {
++	char	*c_name;	/* name of command */
++	char	*c_help;	/* help string */
++	char	c_bell;		/* give bell when command completes */
++	char	c_conn;		/* must be connected to use command */
++	char	c_proxy;	/* proxy server may execute */
++	void	(*c_handler) __P((int, char **)); /* function to call */
++};
++
++struct macel {
++	char mac_name[9];	/* macro name */
++	char *mac_start;	/* start of macro in macbuf */
++	char *mac_end;		/* end of macro in macbuf */
++};
++
+ #include "extern.h"
+ 
+ #ifndef FTP_EXTERN
+@@ -108,23 +126,6 @@
+ 
+ FTP_EXTERN int	options;	/* used during socket creation */
+ 
+-/*
+- * Format of command table.
+- */
+-struct cmd {
+-	char	*c_name;	/* name of command */
+-	char	*c_help;	/* help string */
+-	char	c_bell;		/* give bell when command completes */
+-	char	c_conn;		/* must be connected to use command */
+-	char	c_proxy;	/* proxy server may execute */
+-	void	(*c_handler) __P((int, char **)); /* function to call */
+-};
+-
+-struct macel {
+-	char mac_name[9];	/* macro name */
+-	char *mac_start;	/* start of macro in macbuf */
+-	char *mac_end;		/* end of macro in macbuf */
+-};
+ 
+ FTP_EXTERN int macnum;			/* number of defined macros */
+ FTP_EXTERN struct macel macros[16];

+ 1 - 1
inetutils/inetutils.spec

@@ -35,7 +35,7 @@ Class:        EVAL
 Group:        Network
 License:      GPL
 Version:      1.4.2
-Release:      20050910
+Release:      20060123
 
 #   package options
 %option       with_fsl     yes