[src/trunk]: src Define intptr_t and uintptr_t via <machine/int_types.h>.

[kleink <kleink%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91a01c3912b8
branches:  trunk
changeset: 493920:91a01c3912b8
user:      kleink <kleink%NetBSD.org@localhost>
date:      Tue Jun 27 05:51:54 2000 +0000

description:
Define intptr_t and uintptr_t via <machine/int_types.h>.

diffstat:

 include/unistd.h   |   9 +++++----
 sys/sys/inttypes.h |  18 +++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs (73 lines):

diff -r 319a2ae7c71f -r 91a01c3912b8 include/unistd.h
--- a/include/unistd.h  Tue Jun 27 05:14:31 2000 +0000
+++ b/include/unistd.h  Tue Jun 27 05:51:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: unistd.h,v 1.84 2000/04/21 16:24:22 minoura Exp $      */
+/*     $NetBSD: unistd.h,v 1.85 2000/06/27 05:51:54 kleink Exp $       */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -75,6 +75,7 @@
 #define        _UNISTD_H_
 
 #include <machine/ansi.h>
+#include <machine/int_types.h>
 #include <sys/cdefs.h>
 #include <sys/featuretest.h>
 #include <sys/types.h>
@@ -215,9 +216,9 @@
 #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
     (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
     (_XOPEN_SOURCE - 0) >= 500
-#ifdef  _BSD_INTPTR_T_
-typedef _BSD_INTPTR_T_ intptr_t;
-#undef  _BSD_INTPTR_T_
+#ifndef        intptr_t
+typedef        __intptr_t      intptr_t;
+#define        intptr_t        intptr_t
 #endif
 
 #define F_ULOCK                0
diff -r 319a2ae7c71f -r 91a01c3912b8 sys/sys/inttypes.h
--- a/sys/sys/inttypes.h        Tue Jun 27 05:14:31 2000 +0000
+++ b/sys/sys/inttypes.h        Tue Jun 27 05:51:54 2000 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: inttypes.h,v 1.2 1998/09/13 14:46:24 christos Exp $    */
+/*     $NetBSD: inttypes.h,v 1.3 2000/06/27 05:51:55 kleink Exp $      */
 
 /*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -43,7 +43,7 @@
 #ifndef _SYS_INTTYPES_H_
 #define _SYS_INTTYPES_H_
 
-#include <machine/ansi.h>
+#include <machine/int_types.h>
 #include <machine/types.h>
 
 /*
@@ -56,14 +56,14 @@
 typedef        u_int32_t               uint32_t;
 typedef        u_int64_t               uint64_t;
 
-#ifdef _BSD_INTPTR_T_
-typedef        _BSD_INTPTR_T_          intptr_t;
-#undef _BSD_INTPTR_T_
+#ifndef        intptr_t
+typedef        __intptr_t              intptr_t;
+#define        intptr_t                intptr_t
 #endif
 
-#ifdef _BSD_UINTPTR_T_
-typedef        _BSD_UINTPTR_T_         uintptr_t;
-#undef _BSD_UINTPTR_T_
+#ifndef        uintptr_t
+typedef        __uintptr_t             uintptr_t;
+#define        uintptr_t               uintptr_t
 #endif
 
 #endif /* !defined(_SYS_INTTYPES_H_) */