Index: net/ipv4/ip_forward.c
--- net/ipv4/ip_forward.c.orig Sat, 20 Dec 1997 14:17:30 +1100 keith (linux-2.1/C/50_ip_forward 1.1.1.2 644) 74.1
+++ net/ipv4/ip_forward.c Sat, 20 Dec 1997 15:53:59 +1100 keith (linux-2.1/C/50_ip_forward 1.1.1.3 644) 74.2
@@ -184,7 +184,7 @@
{
#endif
maddr = inet_select_addr(dev2, rt->rt_gateway, RT_SCOPE_UNIVERSE);
- if (fw_res = ip_fw_masq_icmp(&skb, maddr) < 0) {
+ if ((fw_res = ip_fw_masq_icmp(&skb, maddr)) < 0) {
kfree_skb(skb, FREE_READ);
return -1;
}
Index: fs/nls/nls_base.c
--- fs/nls/nls_base.c.orig Tue, 04 Nov 1997 15:51:56 +1100 keith (linux-2.1/j/b/15_nls_base.c 1.2 644) 74.1
+++ fs/nls/nls_base.c Sat, 20 Dec 1997 15:53:59 +1100 keith (linux-2.1/j/b/15_nls_base.c 1.3 644) 74.2
@@ -205,8 +205,10 @@
struct nls_table *load_nls(char *charset)
{
struct nls_table *nls;
+#ifdef CONFIG_KERNELD
char buf[40];
int ret;
+#endif
nls = find_nls(charset);
if (nls) {
Index: include/linux/ntfs_fs.h
--- include/linux/ntfs_fs.h.orig Sat, 20 Dec 1997 14:27:02 +1100 keith (linux-2.1/v/b/1_ntfs_fs.h 1.1 644) 74.1
+++ include/linux/ntfs_fs.h Sat, 20 Dec 1997 15:53:59 +1100 keith (linux-2.1/v/b/1_ntfs_fs.h 1.2 644) 74.2
@@ -1,7 +1,7 @@
#ifndef _LINUX_NTFS_FS_H
#define _LINUX_NTFS_FS_H
-int init_ntfs_fs();
+int init_ntfs_fs(void);
#endif