From 74ac9308887881788b02d7e7a70280f20d944b9e Mon Sep 17 00:00:00 2001 From: tijl Date: Fri, 4 Feb 2011 13:09:46 +0000 Subject: Replace __LP64__ with __mips_n64. This partly reverts r217147. Requested by: jmallett, imp Approved by: kib (mentor) --- sys/mips/include/_inttypes.h | 2 +- sys/mips/include/_limits.h | 2 +- sys/mips/include/_stdint.h | 6 +++--- sys/mips/include/_types.h | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sys/mips') diff --git a/sys/mips/include/_inttypes.h b/sys/mips/include/_inttypes.h index cd8386d..7bea164 100644 --- a/sys/mips/include/_inttypes.h +++ b/sys/mips/include/_inttypes.h @@ -38,7 +38,7 @@ * Macros for format specifiers. */ -#ifdef __LP64__ +#ifdef __mips_n64 #define __PRI64 "l" #define __PRIptr "l" #else diff --git a/sys/mips/include/_limits.h b/sys/mips/include/_limits.h index 758c0e3..8755908 100644 --- a/sys/mips/include/_limits.h +++ b/sys/mips/include/_limits.h @@ -58,7 +58,7 @@ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -#ifdef __LP64__ +#ifdef __mips_n64 #define __ULONG_MAX 0xffffffffffffffff #define __LONG_MAX 0x7fffffffffffffff #define __LONG_MIN (-0x7fffffffffffffff - 1) diff --git a/sys/mips/include/_stdint.h b/sys/mips/include/_stdint.h index 7178007..e71f93d 100644 --- a/sys/mips/include/_stdint.h +++ b/sys/mips/include/_stdint.h @@ -51,7 +51,7 @@ #define UINT16_C(c) (c) #define UINT32_C(c) (c ## U) -#ifdef __LP64__ +#ifdef __mips_n64 #define INT64_C(c) (c ## L) #define UINT64_C(c) (c ## UL) #else @@ -136,7 +136,7 @@ * ISO/IEC 9899:1999 * 7.18.2.4 Limits of integer types capable of holding object pointers */ -#ifdef __LP64__ +#ifdef __mips_n64 #define INTPTR_MIN INT64_MIN #define INTPTR_MAX INT64_MAX #define UINTPTR_MAX UINT64_MAX @@ -158,7 +158,7 @@ * ISO/IEC 9899:1999 * 7.18.3 Limits of other integer types */ -#ifdef __LP64__ +#ifdef __mips_n64 /* Limits of ptrdiff_t. */ #define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h index 40c8db2..4d57e20 100644 --- a/sys/mips/include/_types.h +++ b/sys/mips/include/_types.h @@ -53,7 +53,7 @@ typedef short __int16_t; typedef unsigned short __uint16_t; typedef int __int32_t; typedef unsigned int __uint32_t; -#ifdef __LP64__ +#ifdef __mips_n64 typedef long __int64_t; typedef unsigned long __uint64_t; #else @@ -76,7 +76,7 @@ typedef __int32_t __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; typedef double __double_t; typedef double __float_t; -#ifdef __LP64__ +#ifdef __mips_n64 typedef __int64_t __critical_t; typedef __int64_t __intfptr_t; typedef __int64_t __intptr_t; @@ -94,14 +94,14 @@ typedef __int8_t __int_least8_t; typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; -#if defined(__LP64__) || defined(__mips_n32) +#if defined(__mips_n64) || defined(__mips_n32) typedef __int64_t __register_t; typedef __int64_t f_register_t; #else typedef __int32_t __register_t; typedef __int32_t f_register_t; #endif -#ifdef __LP64__ +#ifdef __mips_n64 typedef __int64_t __ptrdiff_t; typedef __int64_t __segsz_t; typedef __uint64_t __size_t; @@ -126,19 +126,19 @@ typedef __uint8_t __uint_least8_t; typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; -#if defined(__LP64__) || defined(__mips_n32) +#if defined(__mips_n64) || defined(__mips_n32) typedef __uint64_t __u_register_t; #else typedef __uint32_t __u_register_t; #endif -#ifdef __LP64__ +#ifdef __mips_n64 typedef __uint64_t __vm_offset_t; typedef __uint64_t __vm_size_t; #else typedef __uint32_t __vm_offset_t; typedef __uint32_t __vm_size_t; #endif -#if defined(__LP64__) || defined(__mips_n32) /* PHYSADDR_64_BIT */ +#if defined(__mips_n64) || defined(__mips_n32) /* PHYSADDR_64_BIT */ typedef __uint64_t __vm_paddr_t; #else typedef __uint32_t __vm_paddr_t; -- cgit v1.1