Index: libjproxygw/types.c
===================================================================
RCS file: /usr/local/cvsroot/jftpgw-devel/libjproxygw/Attic/types.c,v
retrieving revision 1.1.2.15
diff -u -r1.1.2.15 types.c
--- libjproxygw/types.c	7 Oct 2004 20:36:36 -0000	1.1.2.15
+++ libjproxygw/types.c	16 Jan 2005 12:41:32 -0000
@@ -972,11 +972,11 @@
 	return ip;
 }
 
-struct ip_t ip_from_s_addr(unsigned int s_addr) {
+struct ip_t ip_from_s_addr(unsigned int saddr) {
 	struct ip_t ip;
 
 	ip.error = 0;
-	ip.ip = s_addr;
+	ip.ip = saddr;
 	ip.netmask = inet_addr("255.255.255.255");
 	return ip;
 }
Index: libjproxygw/types.h
===================================================================
RCS file: /usr/local/cvsroot/jftpgw-devel/libjproxygw/Attic/types.h,v
retrieving revision 1.1.2.12
diff -u -r1.1.2.12 types.h
--- libjproxygw/types.h	7 Oct 2004 20:36:36 -0000	1.1.2.12
+++ libjproxygw/types.h	16 Jan 2005 12:41:32 -0000
@@ -250,7 +250,7 @@
 /* --------end struct portrangestruct---------------- */
 /* --------start struct ip--------------------------- */
 struct ip_t ip_parse_from_char(const char* str);
-struct ip_t ip_from_s_addr(unsigned int s_addr);
+struct ip_t ip_from_s_addr(unsigned int saddr);
 char* ip_to_mchar(struct ip_t ip);
 /* --------end struct ip----------------------------- */
 /* --------start struct address---------------------- */
Index: libjproxygw/util.c
===================================================================
RCS file: /usr/local/cvsroot/jftpgw-devel/libjproxygw/Attic/util.c,v
retrieving revision 1.1.2.15
diff -u -r1.1.2.15 util.c
--- libjproxygw/util.c	12 Aug 2004 10:36:28 -0000	1.1.2.15
+++ libjproxygw/util.c	16 Jan 2005 12:41:32 -0000
@@ -24,6 +24,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include "jproxygw.h"
 
@@ -288,7 +289,7 @@
 	length = 0;
 	p = msg;
 	do {
-		if (isdigit(p[0]) && isdigit(p[1]) && isdigit(p[2])
+		if (isdigit((int)p[0]) && isdigit((int)p[1]) && isdigit((int)p[2])
 					&& (p[3] == ' ' || p[3] == '-')) {
 
 			p += 4;