summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1999-01-07 23:39:04 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1999-01-07 23:39:04 +0000
commit78e4e6f266a06179e8bb5af042d81cb629601dc4 (patch)
tree02dc229dd8b5b45fb8c74d65b0015410d53b3489
parent442a311375e09fddb113ba6a49228530c53bb53f (diff)
move uint*_t to machine/types.h
Diffstat
-rw-r--r--include/inttypes.h12
-rw-r--r--sys/arch/alpha/include/types.h6
-rw-r--r--sys/arch/arm32/include/types.h4
-rw-r--r--sys/arch/hppa/include/types.h7
-rw-r--r--sys/arch/i386/include/types.h5
-rw-r--r--sys/arch/kbus/include/types.h4
-rw-r--r--sys/arch/m68k/include/types.h7
-rw-r--r--sys/arch/mips/include/types.h7
-rw-r--r--sys/arch/mvme88k/include/types.h4
-rw-r--r--sys/arch/pc532/include/types.h5
-rw-r--r--sys/arch/powerpc/include/types.h4
-rw-r--r--sys/arch/sparc/include/types.h6
-rw-r--r--sys/arch/vax/include/types.h6
-rw-r--r--sys/arch/wgrisc/include/types.h7
-rw-r--r--sys/sys/types.h7
15 files changed, 67 insertions, 24 deletions
diff --git a/include/inttypes.h b/include/inttypes.h
index db9f30d717b..68f7ad98d19 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: inttypes.h,v 1.2 1998/06/21 22:13:35 millert Exp $ */
+/* $OpenBSD: inttypes.h,v 1.3 1999/01/07 23:39:03 millert Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -33,16 +33,6 @@
/* Machine type dependent parameters. */
#include <machine/types.h>
-/*
- * Fixed-size integer types as specified in XPG4.2.
- * int8_t, int16_t, int32_t, int64_t are defined in <machine/types.h>
- */
-
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-typedef u_int64_t uint64_t;
-
/* XXX - these really belong in <machine/types.h> (maybe create u_register_t) */
typedef long intptr_t;
typedef unsigned long uintptr_t;
diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h
index ce7e4bb61ca..c320b423e61 100644
--- a/sys/arch/alpha/include/types.h
+++ b/sys/arch/alpha/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.4 1997/01/24 19:57:21 niklas Exp $ */
+/* $OpenBSD: types.h,v 1.5 1999/01/07 23:38:59 millert Exp $ */
/* $NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $ */
/*-
@@ -61,12 +61,16 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long int64_t;
typedef unsigned long u_int64_t;
+typedef unsigned long uint64_t;
typedef int64_t register_t;
diff --git a/sys/arch/arm32/include/types.h b/sys/arch/arm32/include/types.h
index 4e841daa8e7..a957a450402 100644
--- a/sys/arch/arm32/include/types.h
+++ b/sys/arch/arm32/include/types.h
@@ -58,12 +58,16 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/hppa/include/types.h b/sys/arch/hppa/include/types.h
index 47c6501317d..c6feed5f41c 100644
--- a/sys/arch/hppa/include/types.h
+++ b/sys/arch/hppa/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.2 1998/11/23 03:28:23 mickey Exp $ */
+/* $OpenBSD: types.h,v 1.3 1999/01/07 23:39:00 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -70,16 +70,21 @@ typedef __signed char int8_t;
typedef char int8_t;
#endif
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
#ifdef __STDC__
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
#else
typedef long int64_t;
typedef unsigned long u_int64_t;
+typedef unsigned long uint64_t;
#endif
typedef int32_t register_t;
diff --git a/sys/arch/i386/include/types.h b/sys/arch/i386/include/types.h
index e333a63b4d4..404e73970d5 100644
--- a/sys/arch/i386/include/types.h
+++ b/sys/arch/i386/include/types.h
@@ -60,14 +60,19 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
+/* LONGLONG */
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/kbus/include/types.h b/sys/arch/kbus/include/types.h
index b9d0a0a6914..aeea2339a18 100644
--- a/sys/arch/kbus/include/types.h
+++ b/sys/arch/kbus/include/types.h
@@ -69,12 +69,16 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/m68k/include/types.h b/sys/arch/m68k/include/types.h
index cda9468020d..e41b6af80f9 100644
--- a/sys/arch/m68k/include/types.h
+++ b/sys/arch/m68k/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.5 1996/08/05 17:12:08 niklas Exp $ */
+/* $OpenBSD: types.h,v 1.6 1999/01/07 23:39:01 millert Exp $ */
/* $NetBSD: types.h,v 1.9 1995/07/06 03:39:38 cgd Exp $ */
/*-
@@ -60,14 +60,19 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
+/* LONGLONG */
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/mips/include/types.h b/sys/arch/mips/include/types.h
index 692b4ebeabf..d9abac1aece 100644
--- a/sys/arch/mips/include/types.h
+++ b/sys/arch/mips/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.3 1998/10/15 21:30:14 imp Exp $ */
+/* $OpenBSD: types.h,v 1.4 1999/01/07 23:39:01 millert Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -63,14 +63,19 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
+/* LONGLONG */
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/mvme88k/include/types.h b/sys/arch/mvme88k/include/types.h
index f8d63e931d3..52892432f3f 100644
--- a/sys/arch/mvme88k/include/types.h
+++ b/sys/arch/mvme88k/include/types.h
@@ -69,12 +69,16 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/pc532/include/types.h b/sys/arch/pc532/include/types.h
index 82b84254f40..ff4571ce8b5 100644
--- a/sys/arch/pc532/include/types.h
+++ b/sys/arch/pc532/include/types.h
@@ -60,14 +60,19 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
+/* LONGLONG */
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h
index 4c576be7dc5..ea14627bc68 100644
--- a/sys/arch/powerpc/include/types.h
+++ b/sys/arch/powerpc/include/types.h
@@ -39,12 +39,16 @@
#define __BIT_TYPES_DEFINED__
typedef signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
typedef u_int32_t register_t;
diff --git a/sys/arch/sparc/include/types.h b/sys/arch/sparc/include/types.h
index fa1d89d60e9..c7d8b13187f 100644
--- a/sys/arch/sparc/include/types.h
+++ b/sys/arch/sparc/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.5 1997/08/08 08:26:52 downsj Exp $ */
+/* $OpenBSD: types.h,v 1.6 1999/01/07 23:39:02 millert Exp $ */
/* $NetBSD: types.h,v 1.11 1996/12/10 23:19:38 pk Exp $ */
/*
@@ -70,12 +70,16 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/vax/include/types.h b/sys/arch/vax/include/types.h
index b66a63e82d1..feef5fb44cd 100644
--- a/sys/arch/vax/include/types.h
+++ b/sys/arch/vax/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.7 1997/05/29 00:04:54 niklas Exp $ */
+/* $OpenBSD: types.h,v 1.8 1999/01/07 23:39:02 millert Exp $ */
/* $NetBSD: types.h,v 1.10 1996/12/05 00:14:00 cgd Exp $ */
/*-
@@ -62,12 +62,16 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long u_int64_t;
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/arch/wgrisc/include/types.h b/sys/arch/wgrisc/include/types.h
index af2da55a4d1..83ec02c19d0 100644
--- a/sys/arch/wgrisc/include/types.h
+++ b/sys/arch/wgrisc/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.1 1997/02/06 16:02:43 pefo Exp $ */
+/* $OpenBSD: types.h,v 1.2 1999/01/07 23:39:03 millert Exp $ */
/* $NetBSD: types.h,v 1.10 1995/07/06 03:39:43 cgd Exp $ */
/*-
@@ -64,14 +64,19 @@ typedef unsigned long vm_size_t;
#define __BIT_TYPES_DEFINED__
typedef __signed char int8_t;
typedef unsigned char u_int8_t;
+typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
+typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
+typedef unsigned int uint32_t;
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
+/* LONGLONG */
+typedef unsigned long long uint64_t;
typedef int32_t register_t;
diff --git a/sys/sys/types.h b/sys/sys/types.h
index ee49d414b73..c606bba8847 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.13 1999/01/07 05:35:22 deraadt Exp $ */
+/* $OpenBSD: types.h,v 1.14 1999/01/07 23:38:59 millert Exp $ */
/* $NetBSD: types.h,v 1.29 1996/11/15 22:48:25 jtc Exp $ */
/*-
@@ -66,11 +66,6 @@ typedef u_int64_t u_quad_t; /* quads */
typedef int64_t quad_t;
typedef quad_t * qaddr_t;
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-typedef u_int64_t uint64_t;
-
typedef char * caddr_t; /* core address */
typedef int32_t daddr_t; /* disk address */
typedef int32_t dev_t; /* device number */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 12:21:09 +0000