Adapt things to use __type_t instead of _BSD_TYPE_T_

Add new sys/_types.h header
Include machine/_types.h or sys/_types.h where applicable

11 files changed, 30 insertions, 30 deletions

diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 7b56e507fbb..c3280c9fcd3 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vasprintf.c,v 1.12 2005/10/10 12:00:52 espie Exp $	*/
+/*	$OpenBSD: vasprintf.c,v 1.13 2006/01/06 18:53:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -23,7 +23,7 @@
 #include "local.h"
 
 int
-vasprintf(char **str, const char *fmt, _BSD_VA_LIST_ ap)
+vasprintf(char **str, const char *fmt, __va_list ap)
 {
 	int ret;
 	FILE f;
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 57893187c9a..84e80889049 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfprintf.c,v 1.35 2005/12/19 19:43:01 millert Exp $ */
+/*	$OpenBSD: vfprintf.c,v 1.36 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -150,7 +150,7 @@ static int exponent(char *, int, int);
 #define CHARINT		0x800		/* 8 bit integer */
 
 int
-vfprintf(FILE *fp, const char *fmt0, _BSD_VA_LIST_ ap)
+vfprintf(FILE *fp, const char *fmt0, __va_list ap)
 {
 	char *fmt;	/* format string */
 	int ch;	/* character from fmt */
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index fa3815d59ee..731a892f41f 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfscanf.c,v 1.17 2006/01/03 00:57:45 millert Exp $ */
+/*	$OpenBSD: vfscanf.c,v 1.18 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -92,7 +92,7 @@ static u_char *__sccl(char *, u_char *);
  * vfscanf
  */
 int
-VFSCANF(FILE *fp, const char *fmt0, _BSD_VA_LIST_ ap)
+VFSCANF(FILE *fp, const char *fmt0, __va_list ap)
 {
 	u_char *fmt = (u_char *)fmt0;
 	int c;		/* character from format, or conversion */
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 42e01eaf5f1..fcc622ca799 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vprintf.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
+/*	$OpenBSD: vprintf.c,v 1.8 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 int
-vprintf(const char *fmt, _BSD_VA_LIST_ ap)
+vprintf(const char *fmt, __va_list ap)
 {
 	return (vfprintf(stdout, fmt, ap));
 }
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index c14ed80b692..228498e75cc 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscanf.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
+/*	$OpenBSD: vscanf.c,v 1.8 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 int
-vscanf(const char *fmt, _BSD_VA_LIST_ ap)
+vscanf(const char *fmt, __va_list ap)
 {
 
 	return (vfscanf(stdin, fmt, ap));
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index 9064571c4d7..e6dd009d106 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsnprintf.c,v 1.11 2005/10/10 12:00:52 espie Exp $ */
+/*	$OpenBSD: vsnprintf.c,v 1.12 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -37,7 +37,7 @@
 #include "local.h"
 
 int
-vsnprintf(char *str, size_t n, const char *fmt, _BSD_VA_LIST_ ap)
+vsnprintf(char *str, size_t n, const char *fmt, __va_list ap)
 {
 	int ret;
 	char dummy;
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 0e3be8d7427..67a53a1bd5d 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsprintf.c,v 1.12 2005/10/10 12:00:52 espie Exp $ */
+/*	$OpenBSD: vsprintf.c,v 1.13 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +42,7 @@ __warn_references(vsprintf,
 #endif
 
 int
-vsprintf(char *str, const char *fmt, _BSD_VA_LIST_ ap)
+vsprintf(char *str, const char *fmt, __va_list ap)
 {
 	int ret;
 	FILE f;
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 52b241751c7..47c1ae61d73 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsscanf.c,v 1.10 2005/08/08 08:05:36 espie Exp $ */
+/*	$OpenBSD: vsscanf.c,v 1.11 2006/01/06 18:53:04 millert Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -44,7 +44,7 @@ eofread(void *cookie, char *buf, int len)
 }
 
 int
-vsscanf(const char *str, const char *fmt, _BSD_VA_LIST_ ap)
+vsscanf(const char *str, const char *fmt, __va_list ap)
 {
 	FILE f;
 	struct __sfileext fext;
diff --git a/lib/libocurses/curses.h b/lib/libocurses/curses.h
index b486b1b6fd1..4146c35bb5d 100644
--- a/lib/libocurses/curses.h
+++ b/lib/libocurses/curses.h
@@ -267,8 +267,8 @@ int	 suspendwin(void);
 int	 touchline(WINDOW *, int, int, int);
 int	 touchoverlap(WINDOW *, WINDOW *);
 int	 touchwin(WINDOW *);
-int 	 vwprintw(WINDOW *, const char *, _BSD_VA_LIST_);
-int      vwscanw(WINDOW *, const char *, _BSD_VA_LIST_);
+int 	 vwprintw(WINDOW *, const char *, __va_list);
+int      vwscanw(WINDOW *, const char *, __va_list);
 int	 waddch(WINDOW *, int);
 int	 waddnstr(WINDOW *, const char *, int);
 int	 wclear(WINDOW *);
@@ -287,7 +287,7 @@ int	 wrefresh(WINDOW *);
 int	 wscanw(WINDOW *, const char *, ...);
 int	 wstandend(WINDOW *);
 int	 wstandout(WINDOW *);
-int	 vwprintw(WINDOW *, const char *, _BSD_VA_LIST_);
+int	 vwprintw(WINDOW *, const char *, __va_list);
 
 /* Private functions that are needed for user programs prototypes. */
 void	 __cputchar(int);
diff --git a/lib/libpthread/uthread/pthread_private.h b/lib/libpthread/uthread/pthread_private.h
index bfb038aa671..83d87db2292 100644
--- a/lib/libpthread/uthread/pthread_private.h
+++ b/lib/libpthread/uthread/pthread_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread_private.h,v 1.54 2005/10/30 03:37:34 brad Exp $	*/
+/*	$OpenBSD: pthread_private.h,v 1.55 2006/01/06 18:53:04 millert Exp $	*/
 /*
  * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
@@ -1236,12 +1236,12 @@ int     _thread_sys_snprintf(char *, size_t, const char *, ...);
 int     _thread_sys_sprintf(char *, const char *, ...);
 int     _thread_sys_sscanf(const char *, const char *, ...);
 int     _thread_sys_ungetc(int, FILE *);
-int     _thread_sys_vfprintf(FILE *, const char *, _BSD_VA_LIST_);
-int     _thread_sys_vprintf(const char *, _BSD_VA_LIST_);
-int     _thread_sys_vscanf(const char *, _BSD_VA_LIST_);
-int     _thread_sys_vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_);
-int     _thread_sys_vsprintf(char *, const char *, _BSD_VA_LIST_);
-int     _thread_sys_vsscanf(const char *, const char *, _BSD_VA_LIST_);
+int     _thread_sys_vfprintf(FILE *, const char *, __va_list);
+int     _thread_sys_vprintf(const char *, __va_list);
+int     _thread_sys_vscanf(const char *, __va_list);
+int     _thread_sys_vsnprintf(char *, size_t, const char *, __va_list);
+int     _thread_sys_vsprintf(char *, const char *, __va_list);
+int     _thread_sys_vsscanf(const char *, const char *, __va_list);
 long    _thread_sys_ftell(FILE *);
 size_t  _thread_sys_fread(void *, size_t, size_t, FILE *);
 size_t  _thread_sys_fwrite(const void *, size_t, size_t, FILE *);
diff --git a/lib/libpthread/uthread/uthread_stack.c b/lib/libpthread/uthread/uthread_stack.c
index 6e359b970fb..003ca2beb2a 100644
--- a/lib/libpthread/uthread/uthread_stack.c
+++ b/lib/libpthread/uthread/uthread_stack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uthread_stack.c,v 1.7 2000/03/22 02:06:05 d Exp $	*/
+/*	$OpenBSD: uthread_stack.c,v 1.8 2006/01/06 18:53:04 millert Exp $	*/
 /*
  * Copyright 1999, David Leonard. All rights reserved.
  * <insert BSD-style license&disclaimer>
@@ -70,19 +70,19 @@ _thread_stack_alloc(base, size)
 
 	/*
 	 * Compute the location of the red zone.
-	 * Use _BSD_PTRDIFF_T_ to convert the storage base pointer
+	 * Use __ptrdiff_t to convert the storage base pointer
 	 * into an integer so that page alignment can be done with
 	 * integer arithmetic.
 	 */
 #if defined(MACHINE_STACK_GROWS_UP)
 	/* Red zone is the last page of the storage: */
-	stack->redzone = (void *)(((_BSD_PTRDIFF_T_)stack->storage +
+	stack->redzone = (void *)(((__ptrdiff_t)stack->storage +
 	    size + nbpg - 1) & ~(nbpg - 1));
 	stack->base = (caddr_t)stack->storage;
 	stack->size = size;
 #else
 	/* Red zone is the first page of the storage: */
-	stack->redzone = (void *)(((_BSD_PTRDIFF_T_)stack->storage + 
+	stack->redzone = (void *)(((__ptrdiff_t)stack->storage + 
 	    nbpg - 1) & ~(nbpg - 1));
 	stack->base = (caddr_t)stack->redzone + nbpg;
 	stack->size = size;