Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge sparc64 types.h; these files are now identical.

This commit is contained in:
mrg 1999-11-27 11:33:39 +00:00
parent d7e14b468a
commit 264af07cff
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/arch/sparc/include/types.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: types.h,v 1.15 1998/08/21 14:09:59 pk Exp $ */
/* $NetBSD: types.h,v 1.16 1999/11/27 11:33:39 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -47,6 +47,10 @@
#ifndef _MACHTYPES_H_
#define _MACHTYPES_H_
#ifdef sun
#undef sun
#endif
#include <sys/cdefs.h>
#if defined(_KERNEL)
@ -55,14 +59,6 @@ typedef struct label_t {
} label_t;
#endif
/* NB: This should probably be if defined(_KERNEL) */
#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
typedef unsigned long paddr_t;
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
#endif
/*
* Basic integral types. Omit the typedef if
* not possible for a machine/compiler combination.
@ -74,11 +70,33 @@ typedef short int16_t;
typedef unsigned short u_int16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
#ifdef __arch64__
/* 64-bit compiler */
typedef long int64_t;
typedef unsigned long u_int64_t;
#else
/* 32-bit compiler */
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
#endif
typedef int32_t register_t;
/* The following are unsigned to prevent annoying sign extended pointers. */
typedef unsigned long register_t;
typedef u_int32_t register32_t;
typedef u_int64_t register64_t;
#if defined(_KERNEL)
typedef unsigned long vaddr_t;
typedef vaddr_t vsize_t;
#ifdef SUN4U
typedef u_int64_t paddr_t;
#else
typedef unsigned long paddr_t;
#endif
typedef paddr_t psize_t;
#endif
#endif /* _MACHTYPES_H_ */

14
sys/arch/sparc64/include/types.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: types.h,v 1.8 1999/01/31 09:21:20 mrg Exp $ */
/* $NetBSD: types.h,v 1.9 1999/11/27 11:33:44 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -70,27 +70,33 @@ typedef short int16_t;
typedef unsigned short u_int16_t;
typedef int int32_t;
typedef unsigned int u_int32_t;
#ifdef __arch64__
/* 64-bit compiler */
typedef long int64_t;
typedef unsigned long u_int64_t;
#else
/* 32-bit compiler */
/* LONGLONG */
typedef long long int64_t;
/* LONGLONG */
typedef unsigned long long u_int64_t;
#endif
/* The following are unsigned to prevent annoying sign extended pointers. */
typedef unsigned long register_t;
typedef u_int32_t register32_t;
typedef u_int64_t register64_t;
/* NB: This should probably be if defined(_KERNEL) */
#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
#if defined(_KERNEL)
typedef unsigned long vaddr_t;
typedef vaddr_t vsize_t;
#ifdef SUN4U
typedef u_int64_t paddr_t;
#else
typedef unsigned long paddr_t;
#endif
typedef paddr_t psize_t;
#endif
#endif /* _MACHTYPES_H_ */