--- lib/getopt.c.dist	2009-04-23 17:20:41.557514560 +0100
+++ lib/getopt.c	2009-04-23 17:21:35.235193280 +0100
@@ -174,6 +174,9 @@ static char *posixly_correct;
 #include <string.h>
 #define	my_index	strchr
 #else
+#ifdef __sgi
+#include <string.h>
+#endif
 
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
--- src/zm.c.dist	2009-07-24 15:33:27.140181800 +0100
+++ src/zm.c	2009-07-24 15:34:03.394652400 +0100
@@ -251,7 +251,7 @@ again2:
  * Send character c with ZMODEM escape sequence encoding.
  *  Escape XON, XOFF. Escape CR following @ (Telenet net escape)
  */
-inline void 
+void 
 zsendline(int c)
 {
 
@@ -277,7 +277,7 @@ zsendline(int c)
 	}
 }
 
-static inline void 
+static void 
 zsendline_s(const char *s, size_t count) 
 {
 	const char *end=s+count;
--- src/tcp.c.dist	2009-07-24 15:35:00.434321000 +0100
+++ src/tcp.c	2009-07-24 15:35:40.917435960 +0100
@@ -56,7 +56,7 @@ tcp_server (char *buf)
 	struct sockaddr_in s;
 	struct sockaddr_in t;
 	int on=1;
-	size_t len;
+	socklen_t len;
 
 	if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
 		error(1,errno,"socket");
@@ -91,7 +91,7 @@ tcp_accept (int d)
 {
 	int so;
 	struct  sockaddr_in s;
-	size_t namelen;
+	socklen_t namelen;
 	int num=0;
 
 	namelen = sizeof(s);