From f110f8c6496d2378eef48600b311722823b19777 Mon Sep 17 00:00:00 2001
From: ed <ed@FreeBSD.org>
Date: Sun, 6 Nov 2011 08:17:23 +0000
Subject: [PATCH] Add missing static keywords to talk(1)

---
 usr.bin/talk/ctl.c       | 1 +
 usr.bin/talk/init_disp.c | 2 --
 usr.bin/talk/invite.c    | 4 ++--
 usr.bin/talk/talk.h      | 3 +++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 4a3937baa0cd..0704b289685e 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 #include <string.h>
 
 #include "talk.h"
+#include "talk_ctl.h"
 
 struct	sockaddr_in daemon_addr = { .sin_len = sizeof(daemon_addr), .sin_family = AF_INET };
 struct	sockaddr_in ctl_addr = { .sin_len = sizeof(ctl_addr), .sin_family = AF_INET };
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index ae162ef25676..47556c936c21 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -50,8 +50,6 @@ static const char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 
 #include "talk.h"
 
-extern volatile sig_atomic_t gotwinch;
-
 /*
  * Make sure the callee can write to the screen
  */
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index b22caafddd82..12b69b567f3f 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -60,8 +60,8 @@ static const char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
  * These are used to delete the
  * invitations.
  */
-int	local_id, remote_id;
-jmp_buf invitebuf;
+static int	local_id, remote_id;
+static jmp_buf invitebuf;
 
 void
 invite_remote(void)
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 85cdf111ce5a..5cf1d5639da8 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -38,6 +38,7 @@
 #include <arpa/inet.h>
 #include <protocols/talkd.h>
 #include <curses.h>
+#include <signal.h>
 
 extern	int sockt;
 extern	int curses_initialized;
@@ -46,6 +47,8 @@ extern	int invitation_waiting;
 extern	const char *current_state;
 extern	int current_line;
 
+extern volatile sig_atomic_t gotwinch;
+
 typedef struct xwin {
 	WINDOW	*x_win;
 	int	x_nlines;