Module Name: src
Committed By: matt
Date: Wed Jan 29 18:51:37 UTC 2014
Modified Files:
src/sys/arch/arm/include: int_fmtio.h int_mwgwtypes.h
Log Message:
Make {,u}int{8,16,32} be of type int.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/int_fmtio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/int_mwgwtypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/int_fmtio.h
diff -u src/sys/arch/arm/include/int_fmtio.h:1.6 src/sys/arch/arm/include/int_fmtio.h:1.7
--- src/sys/arch/arm/include/int_fmtio.h:1.6 Wed Jan 29 01:40:35 2014
+++ src/sys/arch/arm/include/int_fmtio.h Wed Jan 29 18:51:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.6 2014/01/29 01:40:35 matt Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.7 2014/01/29 18:51:37 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,15 +46,9 @@
#define PRIdLEAST16 "d" /* int_least16_t */
#define PRIdLEAST32 "d" /* int_least32_t */
#define PRIdLEAST64 "lld" /* int_least64_t */
-#ifdef _LP64
-#define PRIdFAST8 "ld" /* int_fast8_t */
-#define PRIdFAST16 "ld" /* int_fast16_t */
-#define PRIdFAST32 "ld" /* int_fast32_t */
-#else
#define PRIdFAST8 "d" /* int_fast8_t */
#define PRIdFAST16 "d" /* int_fast16_t */
#define PRIdFAST32 "d" /* int_fast32_t */
-#endif
#define PRIdFAST64 "lld" /* int_fast64_t */
#define PRIdMAX "lld" /* intmax_t */
#define PRIdPTR "ld" /* intptr_t */
@@ -67,15 +61,9 @@
#define PRIiLEAST16 "i" /* int_least16_t */
#define PRIiLEAST32 "i" /* int_least32_t */
#define PRIiLEAST64 "lli" /* int_least64_t */
-#ifdef _LP64
-#define PRIiFAST8 "li" /* int_fast8_t */
-#define PRIiFAST16 "li" /* int_fast16_t */
-#define PRIiFAST32 "li" /* int_fast32_t */
-#else
#define PRIiFAST8 "i" /* int_fast8_t */
#define PRIiFAST16 "i" /* int_fast16_t */
#define PRIiFAST32 "i" /* int_fast32_t */
-#endif
#define PRIiFAST64 "lli" /* int_fast64_t */
#define PRIiMAX "lli" /* intmax_t */
#define PRIiPTR "li" /* intptr_t */
@@ -90,15 +78,9 @@
#define PRIoLEAST16 "o" /* uint_least16_t */
#define PRIoLEAST32 "o" /* uint_least32_t */
#define PRIoLEAST64 "llo" /* uint_least64_t */
-#ifdef _LP64
-#define PRIoFAST8 "lo" /* uint_fast8_t */
-#define PRIoFAST16 "lo" /* uint_fast16_t */
-#define PRIoFAST32 "lo" /* uint_fast32_t */
-#else
#define PRIoFAST8 "o" /* uint_fast8_t */
#define PRIoFAST16 "o" /* uint_fast16_t */
#define PRIoFAST32 "o" /* uint_fast32_t */
-#endif
#define PRIoFAST64 "llo" /* uint_fast64_t */
#define PRIoMAX "llo" /* uintmax_t */
#define PRIoPTR "lo" /* uintptr_t */
@@ -111,15 +93,9 @@
#define PRIuLEAST16 "u" /* uint_least16_t */
#define PRIuLEAST32 "u" /* uint_least32_t */
#define PRIuLEAST64 "llu" /* uint_least64_t */
-#ifdef _LP64
-#define PRIuFAST8 "lu" /* uint_fast8_t */
-#define PRIuFAST16 "lu" /* uint_fast16_t */
-#define PRIuFAST32 "lu" /* uint_fast32_t */
-#else
#define PRIuFAST8 "u" /* uint_fast8_t */
#define PRIuFAST16 "u" /* uint_fast16_t */
#define PRIuFAST32 "u" /* uint_fast32_t */
-#endif
#define PRIuFAST64 "llu" /* uint_fast64_t */
#define PRIuMAX "llu" /* uintmax_t */
#define PRIuPTR "lu" /* uintptr_t */
@@ -132,15 +108,9 @@
#define PRIxLEAST16 "x" /* uint_least16_t */
#define PRIxLEAST32 "x" /* uint_least32_t */
#define PRIxLEAST64 "llx" /* uint_least64_t */
-#ifdef _LP64
-#define PRIxFAST8 "lx" /* uint_fast8_t */
-#define PRIxFAST16 "lx" /* uint_fast16_t */
-#define PRIxFAST32 "lx" /* uint_fast32_t */
-#else
#define PRIxFAST8 "x" /* uint_fast8_t */
#define PRIxFAST16 "x" /* uint_fast16_t */
#define PRIxFAST32 "x" /* uint_fast32_t */
-#endif
#define PRIxFAST64 "llx" /* uint_fast64_t */
#define PRIxMAX "llx" /* uintmax_t */
#define PRIxPTR "lx" /* uintptr_t */
@@ -153,15 +123,9 @@
#define PRIXLEAST16 "X" /* uint_least16_t */
#define PRIXLEAST32 "X" /* uint_least32_t */
#define PRIXLEAST64 "llX" /* uint_least64_t */
-#ifdef _LP64
-#define PRIXFAST8 "lX" /* uint_fast8_t */
-#define PRIXFAST16 "lX" /* uint_fast16_t */
-#define PRIXFAST32 "lX" /* uint_fast32_t */
-#else
#define PRIXFAST8 "X" /* uint_fast8_t */
#define PRIXFAST16 "X" /* uint_fast16_t */
#define PRIXFAST32 "X" /* uint_fast32_t */
-#endif
#define PRIXFAST64 "llX" /* uint_fast64_t */
#define PRIXMAX "llX" /* uintmax_t */
#define PRIXPTR "lX" /* uintptr_t */
@@ -176,15 +140,9 @@
#define SCNdLEAST16 "hd" /* int_least16_t */
#define SCNdLEAST32 "d" /* int_least32_t */
#define SCNdLEAST64 "lld" /* int_least64_t */
-#ifdef _LP64
-#define SCNdFAST8 "ld" /* int_fast8_t */
-#define SCNdFAST16 "ld" /* int_fast16_t */
-#define SCNdFAST32 "ld" /* int_fast32_t */
-#else
#define SCNdFAST8 "d" /* int_fast8_t */
#define SCNdFAST16 "d" /* int_fast16_t */
#define SCNdFAST32 "d" /* int_fast32_t */
-#endif
#define SCNdFAST64 "lld" /* int_fast64_t */
#define SCNdMAX "lld" /* intmax_t */
#define SCNdPTR "ld" /* intptr_t */
@@ -197,15 +155,9 @@
#define SCNiLEAST16 "hi" /* int_least16_t */
#define SCNiLEAST32 "i" /* int_least32_t */
#define SCNiLEAST64 "lli" /* int_least64_t */
-#ifdef _LP64
-#define SCNiFAST8 "li" /* int_fast8_t */
-#define SCNiFAST16 "li" /* int_fast16_t */
-#define SCNiFAST32 "li" /* int_fast32_t */
-#else
#define SCNiFAST8 "i" /* int_fast8_t */
#define SCNiFAST16 "i" /* int_fast16_t */
#define SCNiFAST32 "i" /* int_fast32_t */
-#endif
#define SCNiFAST64 "lli" /* int_fast64_t */
#define SCNiMAX "lli" /* intmax_t */
#define SCNiPTR "li" /* intptr_t */
@@ -220,15 +172,9 @@
#define SCNoLEAST16 "ho" /* uint_least16_t */
#define SCNoLEAST32 "o" /* uint_least32_t */
#define SCNoLEAST64 "llo" /* uint_least64_t */
-#ifdef _LP64
-#define SCNoFAST8 "lo" /* uint_fast8_t */
-#define SCNoFAST16 "lo" /* uint_fast16_t */
-#define SCNoFAST32 "lo" /* uint_fast32_t */
-#else
#define SCNoFAST8 "o" /* uint_fast8_t */
#define SCNoFAST16 "o" /* uint_fast16_t */
#define SCNoFAST32 "o" /* uint_fast32_t */
-#endif
#define SCNoFAST64 "llo" /* uint_fast64_t */
#define SCNoMAX "llo" /* uintmax_t */
#define SCNoPTR "lo" /* uintptr_t */
@@ -241,15 +187,9 @@
#define SCNuLEAST16 "hu" /* uint_least16_t */
#define SCNuLEAST32 "u" /* uint_least32_t */
#define SCNuLEAST64 "llu" /* uint_least64_t */
-#ifdef _LP64
-#define SCNuFAST8 "lu" /* uint_fast8_t */
-#define SCNuFAST16 "lu" /* uint_fast16_t */
-#define SCNuFAST32 "lu" /* uint_fast32_t */
-#else
#define SCNuFAST8 "u" /* uint_fast8_t */
#define SCNuFAST16 "u" /* uint_fast16_t */
#define SCNuFAST32 "u" /* uint_fast32_t */
-#endif
#define SCNuFAST64 "llu" /* uint_fast64_t */
#define SCNuMAX "llu" /* uintmax_t */
#define SCNuPTR "lu" /* uintptr_t */
@@ -262,15 +202,9 @@
#define SCNxLEAST16 "hx" /* uint_least16_t */
#define SCNxLEAST32 "x" /* uint_least32_t */
#define SCNxLEAST64 "llx" /* uint_least64_t */
-#ifdef _LP64
-#define SCNxFAST8 "lx" /* uint_fast8_t */
-#define SCNxFAST16 "lx" /* uint_fast16_t */
-#define SCNxFAST32 "lx" /* uint_fast32_t */
-#else
#define SCNxFAST8 "x" /* uint_fast8_t */
#define SCNxFAST16 "x" /* uint_fast16_t */
#define SCNxFAST32 "x" /* uint_fast32_t */
-#endif
#define SCNxFAST64 "llx" /* uint_fast64_t */
#define SCNxMAX "llx" /* uintmax_t */
#define SCNxPTR "lx" /* uintptr_t */
Index: src/sys/arch/arm/include/int_mwgwtypes.h
diff -u src/sys/arch/arm/include/int_mwgwtypes.h:1.5 src/sys/arch/arm/include/int_mwgwtypes.h:1.6
--- src/sys/arch/arm/include/int_mwgwtypes.h:1.5 Wed Jan 29 01:40:35 2014
+++ src/sys/arch/arm/include/int_mwgwtypes.h Wed Jan 29 18:51:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_mwgwtypes.h,v 1.5 2014/01/29 01:40:35 matt Exp $ */
+/* $NetBSD: int_mwgwtypes.h,v 1.6 2014/01/29 18:51:37 matt Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -74,29 +74,23 @@ typedef __UINT_LEAST64_TYPE__ uint_least
/* 7.18.1.3 Fastest minimum-width integer types */
-#ifdef _LP64
-#define __INT_FAST_PREFIX__ long
-#else
-#define __INT_FAST_PREFIX__
-#endif
-
#ifndef __INT_FAST8_TYPE__
-# define __INT_FAST8_TYPE__ __INT_FAST_PREFIX__ int
+# define __INT_FAST8_TYPE__ int
#endif
#ifndef __UINT_FAST8_TYPE__
-# define __UINT_FAST8_TYPE__ __INT_FAST_PREFIX__ unsigned int
+# define __UINT_FAST8_TYPE__ unsigned int
#endif
#ifndef __INT_FAST16_TYPE__
-# define __INT_FAST16_TYPE__ __INT_FAST_PREFIX__ int
+# define __INT_FAST16_TYPE__ int
#endif
#ifndef __UINT_FAST16_TYPE__
-# define __UINT_FAST16_TYPE__ __INT_FAST_PREFIX__ unsigned int
+# define __UINT_FAST16_TYPE__ unsigned int
#endif
#ifndef __INT_FAST32_TYPE__
-# define __INT_FAST32_TYPE__ __INT_FAST_PREFIX__ int
+# define __INT_FAST32_TYPE__ int
#endif
#ifndef __UINT_FAST32_TYPE__
-# define __UINT_FAST32_TYPE__ __INT_FAST_PREFIX__ unsigned int
+# define __UINT_FAST32_TYPE__ unsigned int
#endif
#ifndef __INT_FAST64_TYPE__
# define __INT_FAST64_TYPE__ long long int
