Date: Sat, 1 Mar 2003 17:16:29 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26151 for review Message-ID: <200303020116.h221GTjm073825@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26151 Change 26151 by jmallett@jmallett_dalek on 2003/03/01 17:15:32 Steal from SPARC64. We're only supporting MIPS-III and above, and our GCC defaults to long64, so this quiets a lot of compiler warnings. Affected files ... .. //depot/projects/mips/sys/mips/include/_stdint.h#2 edit .. //depot/projects/mips/sys/mips/include/_types.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/_stdint.h#2 (text+ko) ==== @@ -34,10 +34,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/_stdint.h,v 1.1 2002/07/29 17:41:16 mike Exp $ + * $FreeBSD: src/sys/sparc64/include/_stdint.h,v 1.1 2002/07/29 17:41:16 mike Exp $ */ -#ifndef _MACHINE__STDINT_H_ +#ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) @@ -45,15 +45,15 @@ #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) -#define INT64_C(c) (c ## LL) +#define INT64_C(c) (c ## L) #define UINT8_C(c) (c) #define UINT16_C(c) (c) #define UINT32_C(c) (c ## U) -#define UINT64_C(c) (c ## ULL) +#define UINT64_C(c) (c ## UL) -#define INTMAX_C(c) (c ## LL) -#define UINTMAX_C(c) (c ## ULL) +#define INTMAX_C(c) (c ## L) +#define UINTMAX_C(c) (c ## UL) #endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ @@ -67,19 +67,19 @@ #define INT8_MIN (-0x7f-1) #define INT16_MIN (-0x7fff-1) #define INT32_MIN (-0x7fffffff-1) -#define INT64_MIN (-0x7fffffffffffffffLL-1) +#define INT64_MIN (-0x7fffffffffffffffL-1) /* Maximum values of exact-width signed integer types. */ #define INT8_MAX 0x7f #define INT16_MAX 0x7fff #define INT32_MAX 0x7fffffff -#define INT64_MAX 0x7fffffffffffffffLL +#define INT64_MAX 0x7fffffffffffffffL /* Maximum values of exact-width unsigned integer types. */ #define UINT8_MAX 0xff #define UINT16_MAX 0xffff #define UINT32_MAX 0xffffffffU -#define UINT64_MAX 0xffffffffffffffffULL +#define UINT64_MAX 0xffffffffffffffffUL /* * ISO/IEC 9899:1999 @@ -129,9 +129,9 @@ * ISO/IEC 9899:1999 * 7.18.2.4 Limits of integer types capable of holding object pointers */ -#define INTPTR_MIN INT32_MIN -#define INTPTR_MAX INT32_MAX -#define UINTPTR_MAX UINT32_MAX +#define INTPTR_MIN INT64_MIN +#define INTPTR_MAX INT64_MAX +#define UINTPTR_MAX UINT64_MAX /* * ISO/IEC 9899:1999 @@ -146,15 +146,15 @@ * 7.18.3 Limits of other integer types */ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT32_MIN -#define PTRDIFF_MAX INT32_MAX +#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ #define SIG_ATOMIC_MIN INT32_MIN #define SIG_ATOMIC_MAX INT32_MAX /* Limit of size_t. */ -#define SIZE_MAX UINT32_MAX +#define SIZE_MAX UINT64_MAX #ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ /* Limits of wchar_t. */ ==== //depot/projects/mips/sys/mips/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/powerpc/include/_types.h,v 1.2 2002/08/23 16:49:05 mike Exp $ + * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.3 2003/02/08 20:37:55 mike Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -48,19 +48,19 @@ typedef unsigned short __uint16_t; typedef int __int32_t; typedef unsigned int __uint32_t; -/* LONGLONG */ -typedef long long __int64_t; -/* LONGLONG */ -typedef unsigned long long __uint64_t; +typedef long __int64_t; +typedef unsigned long __uint64_t; /* * Standard type definitions. */ -typedef __uint32_t __clock_t; /* clock()... */ -typedef __int32_t __critical_t; -typedef __int32_t __intfptr_t; +typedef __int32_t __clock_t; /* clock()... */ +typedef __int64_t __critical_t; +typedef double __double_t; +typedef float __float_t; +typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; -typedef __int32_t __intptr_t; +typedef __int64_t __intptr_t; typedef __int32_t __int_fast8_t; typedef __int32_t __int_fast16_t; typedef __int32_t __int_fast32_t; @@ -69,15 +69,15 @@ typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; -typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ -typedef __int32_t __register_t; -typedef __int32_t __segsz_t; /* segment size (in pages) */ -typedef __uint32_t __size_t; /* sizeof() */ -typedef __int32_t __ssize_t; /* byte count or error */ +typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */ +typedef __int64_t __register_t; +typedef __int64_t __segsz_t; /* segment size (in pages) */ +typedef __uint64_t __size_t; /* sizeof() */ +typedef __int64_t __ssize_t; /* byte count or error */ typedef __int32_t __time_t; /* time()... */ -typedef __uint32_t __uintfptr_t; +typedef __uint64_t __uintfptr_t; typedef __uint64_t __uintmax_t; -typedef __uint32_t __uintptr_t; +typedef __uint64_t __uintptr_t; typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; @@ -86,11 +86,11 @@ typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; -typedef __uint32_t __u_register_t; -typedef __uint32_t __vm_offset_t; +typedef __uint64_t __u_register_t; +typedef __uint64_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; typedef __uint64_t __vm_pindex_t; -typedef __uint32_t __vm_size_t; +typedef __uint64_t __vm_size_t; /* * Unusual type definitions. @@ -98,13 +98,7 @@ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) typedef __builtin_va_list __va_list; /* internally known to gcc */ #else -typedef struct { - char __gpr; - char __fpr; - char __pad[2]; - char *__stack; - char *__base; -} __va_list; +typedef char * __va_list; #endif /* post GCC 2.95 */ #if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303020116.h221GTjm073825>