Userland programs should include <errno.h> not <sys/errno.h>

OK deraadt@

7 files changed, 15 insertions, 15 deletions

diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 2defe41f1d7..10ee787868c 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bindresvport.c,v 1.16 2005/04/01 07:44:03 otto Exp $	*/
+/*	$OpenBSD: bindresvport.c,v 1.17 2005/12/21 01:40:22 millert Exp $	*/
 
 /*
  * Copyright 1996, Jason Downs.  All rights reserved.
@@ -25,9 +25,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 7f23799f418..3bbd3167789 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt_generic.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
+/*	$OpenBSD: clnt_generic.c,v 1.6 2005/12/21 01:40:22 millert Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -31,10 +31,10 @@
 /*
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
+#include <errno.h>
 #include <string.h>
 #include <rpc/rpc.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <netdb.h>
 
 /*
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 24820521200..9b4b068b25e 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc.c,v 1.20 2005/08/08 08:05:35 espie Exp $ */
+/*	$OpenBSD: svc.c,v 1.21 2005/12/21 01:40:22 millert Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -38,10 +38,10 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/errno.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
 
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 40afd62a810..c77ba875b8d 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_run.c,v 1.17 2005/09/10 23:04:26 brad Exp $ */
+/*	$OpenBSD: svc_run.c,v 1.18 2005/12/21 01:40:22 millert Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -33,7 +33,7 @@
  * Wait for input, call server program.
  */
 #include <rpc/rpc.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c
index 7c6d83333e9..62d4a941adb 100644
--- a/lib/libc/sys/ptrace.c
+++ b/lib/libc/sys/ptrace.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: ptrace.c,v 1.3 2003/06/11 21:03:10 deraadt Exp $	*/
+/*	$OpenBSD: ptrace.c,v 1.4 2005/12/21 01:40:23 millert Exp $	*/
 /* David Leonard <d@openbsd.org>, 1999. Public domain. */
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 int _ptrace(int, pid_t, caddr_t, int);
 
diff --git a/lib/libpthread/uthread/uthread_cancel.c b/lib/libpthread/uthread/uthread_cancel.c
index b08702ce857..c5eb358aff9 100644
--- a/lib/libpthread/uthread/uthread_cancel.c
+++ b/lib/libpthread/uthread/uthread_cancel.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: uthread_cancel.c,v 1.13 2002/05/07 05:13:17 pvalchev Exp $	*/
+/*	$OpenBSD: uthread_cancel.c,v 1.14 2005/12/21 01:40:23 millert Exp $	*/
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
  */
-#include <sys/errno.h>
+#include <errno.h>
 #include <pthread.h>
 #include "pthread_private.h"
 
diff --git a/lib/librpcsvc/bootparam_prot.x b/lib/librpcsvc/bootparam_prot.x
index 5d791c7ecf4..326ba1bd556 100644
--- a/lib/librpcsvc/bootparam_prot.x
+++ b/lib/librpcsvc/bootparam_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam_prot.x,v 1.6 2004/01/17 12:32:11 deraadt Exp $	*/
+/*	$OpenBSD: bootparam_prot.x,v 1.7 2005/12/21 01:40:23 millert Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -43,13 +43,13 @@
 %#include <sys/param.h>
 %#include <rpc/types.h>
 %#include <sys/time.h>
-%#include <sys/errno.h>
 %#include <sys/ucred.h>
+%#include <errno.h>
 #else
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.6 2004/01/17 12:32:11 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.7 2005/12/21 01:40:23 millert Exp $";
 %#endif /* not lint */
 #endif