From 7aed7a3810821b000d16d3b32dcc224786221cb9 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 25 Aug 2009 14:56:27 +0200
Subject: [PATCH] tip(1): Fix some amd64 warnings.

Taken-from: FreeBSD
---
 usr.bin/tip/tip/hunt.c  | 6 +++---
 usr.bin/tip/tip/tip.h   | 2 +-
 usr.bin/tip/tip/value.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index b12deb83d6..cdada18465 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -54,7 +54,7 @@ dead()
 	longjmp(deadline, 1);
 }
 
-int
+long
 hunt(name)
 	char *name;
 {
@@ -108,10 +108,10 @@ hunt(name)
 #endif
 #endif /* HAVE_TERMIOS */
 			signal(SIGALRM, SIG_DFL);
-			return ((int)cp);
+			return ((long)cp);
 		}
 		(void)uu_unlock(uucplock);
 	}
 	signal(SIGALRM, f);
-	return (deadfl ? -1 : (int)cp);
+	return (deadfl ? -1 : (long)cp);
 }
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index 18ba28bf6f..89f3dda046 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -303,7 +303,7 @@ extern	int   any(char, char *);
 extern	void  setscript(void);
 extern	void  tipout(void);
 extern	void  vinit(void);
-extern	int   hunt(char *);
+extern	long  hunt(char *);
 extern	int vstring(char *, char *);
 extern	void setparity(char *);
 extern	void vlex(char *);
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index af0ccd30d6..b8073633f2 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -181,7 +181,7 @@ vtoken(s)
 		if ((p = vlookup(s))) {
 			cp++;
 			if (p->v_type&NUMBER)
-				vassign(p, (char *) atoi(cp));
+				vassign(p, (char *)(intptr_t)atoi(cp));
 			else {
 				if (strcmp(s, "record") == 0)
 					cp = expand(cp);
@@ -354,7 +354,7 @@ vstring(s,v)
 	if (p == 0)
 		return (1);
 	if (p->v_type&NUMBER)
-		vassign(p, (char *) atoi(v));
+		vassign(p, (char *)(intptr_t)atoi(v));
 	else {
 		if (strcmp(s, "record") == 0)
 			v = expand(v);
-- 
2.41.0