diff -ur usagi_orig/src/mkdtcp/chap.c usagi/src/mkdtcp/chap.c
--- usagi_orig/src/mkdtcp/chap.c	2003-03-06 10:33:51.000000000 +0900
+++ usagi/src/mkdtcp/chap.c	2012-09-03 01:19:57.218434540 +0900
@@ -101,7 +101,7 @@
 	char *p;
 	char *challenge;
 	
-	if (getline(sockfd, recvbuf, sizeof(recvbuf)) < 0)
+	if (getline_(sockfd, recvbuf, sizeof(recvbuf)) < 0)
 		return NULL;
 	
 	p = strtok(recvbuf, " \t");
diff -ur usagi_orig/src/mkdtcp/dtcp.c usagi/src/mkdtcp/dtcp.c
--- usagi_orig/src/mkdtcp/dtcp.c	2003-05-01 01:17:34.000000000 +0900
+++ usagi/src/mkdtcp/dtcp.c	2012-09-03 01:20:17.763776303 +0900
@@ -102,7 +102,7 @@
 		return -1;
 	}
 
-	if (getline(sockfd, recvbuf, sizeof(recvbuf)) < 0)
+	if (getline_(sockfd, recvbuf, sizeof(recvbuf)) < 0)
 		return -1;
 
 	rtn = do_rcvchk(recvbuf);
@@ -125,7 +125,7 @@
 		return -1;
 	}
 
-	if (getline(sockfd, recvbuf, sizeof(recvbuf)) < 0)
+	if (getline_(sockfd, recvbuf, sizeof(recvbuf)) < 0)
 		return -1;
 
 	rtn = do_rcvchk(recvbuf);
diff -ur usagi_orig/src/mkdtcp/dtcpc.c usagi/src/mkdtcp/dtcpc.c
--- usagi_orig/src/mkdtcp/dtcpc.c	2005-03-30 13:31:20.000000000 +0900
+++ usagi/src/mkdtcp/dtcpc.c	2012-09-03 01:20:39.021137615 +0900
@@ -497,7 +497,7 @@
 		return -1;
 	}
 
-	if (getline(sockfd, msg, sizeof(msg)) < 0) {
+	if (getline_(sockfd, msg, sizeof(msg)) < 0) {
 		syslog(LOG_ERR, "mktunnel: getline failed\n");
 		return -1;
 	}
diff -ur usagi_orig/src/mkdtcp/md5.h usagi/src/mkdtcp/md5.h
--- usagi_orig/src/mkdtcp/md5.h	2002-08-01 15:38:48.000000000 +0900
+++ usagi/src/mkdtcp/md5.h	2012-09-03 01:20:56.454229957 +0900
@@ -31,7 +31,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* MD5 context. */
 typedef struct {
diff -ur usagi_orig/src/mkdtcp/util.c usagi/src/mkdtcp/util.c
--- usagi_orig/src/mkdtcp/util.c	2004-02-17 23:18:48.000000000 +0900
+++ usagi/src/mkdtcp/util.c	2012-09-03 01:21:18.515591047 +0900
@@ -76,7 +76,7 @@
 }
 
 int 
-getline(int fd, char *buf, int len)
+getline_(int fd, char *buf, int len)
 {
 	char c;    /* read char */
 	int n = 0; /* read bytes */
diff -ur usagi_orig/src/mkdtcp/util.h usagi/src/mkdtcp/util.h
--- usagi_orig/src/mkdtcp/util.h	2002-08-01 15:39:04.000000000 +0900
+++ usagi/src/mkdtcp/util.h	2012-09-03 01:21:06.778871952 +0900
@@ -5,7 +5,7 @@
 int debug;
 
 int tgetline(int fd, char *buf, int len , long timeout);
-int getline(int fd, char *buf, int len);
+int getline_(int fd, char *buf, int len);
 void trim(char *str, int strlen);
 int write_pid(char *pidfile, pid_t pid);
 int read_pid(char *pidfile);