From f0d583683021c90b3d5369049ce03b5d8a6dfb95 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 10 Oct 2005 16:18:04 +0000
Subject: Remove nested extern int errno. Include errno.h in one case instead.

---
 editors/sam/distinfo         |  4 +++-
 editors/sam/patches/patch-aj | 12 ++++++++++++
 editors/sam/patches/patch-ak | 21 +++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 editors/sam/patches/patch-aj
 create mode 100644 editors/sam/patches/patch-ak

(limited to 'editors')

diff --git a/editors/sam/distinfo b/editors/sam/distinfo
index 07582e4f8ff..d48b34e92de 100644
--- a/editors/sam/distinfo
+++ b/editors/sam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:12 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/10/10 16:18:04 joerg Exp $
 
 SHA1 (sam.msg.gz) = c6d2baa07a3b7410658e31e6ebfb997809c8323e
 RMD160 (sam.msg.gz) = f3a6f354bd11b45966818188392c4655267f0571
@@ -12,3 +12,5 @@ SHA1 (patch-af) = b7f32619782b542773a85ea2d24c55f05782af94
 SHA1 (patch-ag) = 348b5400cccdd8cdcc6e63244a6e28551bbfb354
 SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b
 SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc
+SHA1 (patch-aj) = 1f6270f7893fce0d1b213fcaa4b91c6c3e82c833
+SHA1 (patch-ak) = 80f9399d23fb615da4d98488e93a58a101e57e4c
diff --git a/editors/sam/patches/patch-aj b/editors/sam/patches/patch-aj
new file mode 100644
index 00000000000..a7af35029bf
--- /dev/null
+++ b/editors/sam/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2005/10/10 16:18:04 joerg Exp $
+
+--- samterm/unix.c.orig	2005-07-30 20:19:23.000000000 +0000
++++ samterm/unix.c
+@@ -102,7 +102,6 @@ extstart(void)
+ 	/* Make the named pipe.  Multiple sams with the same user/display share the same pipe */
+ 	if (mkfifo(exname, 0600) == -1) {
+ 		struct stat	statb;
+-		extern int	errno;
+ 
+ 		if (errno != EEXIST || stat(exname, &statb) == -1)
+ 			return;
diff --git a/editors/sam/patches/patch-ak b/editors/sam/patches/patch-ak
new file mode 100644
index 00000000000..e710b6b6bf8
--- /dev/null
+++ b/editors/sam/patches/patch-ak
@@ -0,0 +1,21 @@
+$NetBSD: patch-ak,v 1.1 2005/10/10 16:18:04 joerg Exp $
+
+--- libframe/misc.c.orig	2005-07-30 20:20:22.000000000 +0000
++++ libframe/misc.c
+@@ -2,6 +2,7 @@
+ #include	<u.h>
+ #include	<libc.h>
+ #include	<pwd.h>
++#include <errno.h>
+ #ifdef	NEEDVARARG
+ #include	<varargs.h>
+ #else
+@@ -22,8 +23,6 @@ fprint(int fd, char *z, ...)
+ 
+ int errstr(char *buf)
+ {
+-	extern int errno;
+-
+ 	strncpy(buf, strerror(errno), ERRLEN);
+ 	return 1;
+ }
-- 
cgit v1.2.3