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

2 files changed, 11 insertions, 11 deletions

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;