From 1534bb5e4074929a07f1fcc1195962967d5508ce Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Wed, 21 Dec 2005 01:40:26 +0000
Subject: Userland programs should include <errno.h> not <sys/errno.h> OK
 deraadt@

---
 usr.bin/elf2ecoff/elf2ecoff.c | 4 ++--
 usr.bin/ktrace/ktrace.c       | 6 +++---
 usr.bin/netstat/mbuf.c        | 6 +++---
 usr.bin/top/machine.c         | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/elf2ecoff/elf2ecoff.c b/usr.bin/elf2ecoff/elf2ecoff.c
index 4f7774ca49b..cc2923a32cc 100644
--- a/usr.bin/elf2ecoff/elf2ecoff.c
+++ b/usr.bin/elf2ecoff/elf2ecoff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf2ecoff.c,v 1.5 2003/11/27 10:33:20 henning Exp $	 */
+/* $OpenBSD: elf2ecoff.c,v 1.6 2005/12/21 01:40:24 millert Exp $	 */
 /* $NetBSD: elf2ecoff.c,v 1.8 1997/07/20 03:50:54 jonathan Exp $	 */
 
 /*
@@ -47,7 +47,7 @@
 #include <machine/elf_abi.h>
 #include <stdio.h>
 #include <sys/exec_ecoff.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <string.h>
 #include <limits.h>
 
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 95916458884..e2cba951541 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ktrace.c,v 1.18 2004/09/14 22:25:06 deraadt Exp $	*/
+/*	$OpenBSD: ktrace.c,v 1.19 2005/12/21 01:40:24 millert Exp $	*/
 /*	$NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $	*/
 
 /*-
@@ -40,17 +40,17 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ktrace.c	8.2 (Berkeley) 4/28/95";
 #endif
-static char *rcsid = "$OpenBSD: ktrace.c,v 1.18 2004/09/14 22:25:06 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ktrace.c,v 1.19 2005/12/21 01:40:24 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/errno.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index c1911788c96..779c353acfc 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.c,v 1.23 2005/05/23 17:35:59 marius Exp $	*/
+/*	$OpenBSD: mbuf.c,v 1.24 2005/12/21 01:40:24 millert Exp $	*/
 /*	$NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: mbuf.c,v 1.23 2005/05/23 17:35:59 marius Exp $";
+static char *rcsid = "$OpenBSD: mbuf.c,v 1.24 2005/12/21 01:40:24 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -44,8 +44,8 @@ static char *rcsid = "$OpenBSD: mbuf.c,v 1.23 2005/05/23 17:35:59 marius Exp $";
 #include <sys/mbuf.h>
 #include <sys/pool.h>
 #include <sys/sysctl.h>
-#include <sys/errno.h>
 
+#include <errno.h>
 #include <kvm.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index a99a0330b4b..2e09df9bf5c 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machine.c,v 1.50 2005/12/04 23:10:06 tedu Exp $	 */
+/* $OpenBSD: machine.c,v 1.51 2005/12/21 01:40:24 millert Exp $	 */
 
 /*-
  * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
@@ -43,7 +43,6 @@
 #include <err.h>
 #include <math.h>
 #include <unistd.h>
-#include <sys/errno.h>
 #include <sys/sysctl.h>
 #include <sys/dir.h>
 #include <sys/dkstat.h>
@@ -52,6 +51,7 @@
 #include <sys/resource.h>
 #include <sys/swap.h>
 #include <err.h>
+#include <errno.h>
 
 #include "top.h"
 #include "display.h"
-- 
cgit v1.2.3