Module Name: src
Committed By: joerg
Date: Mon Jul 28 11:22:46 UTC 2014
Modified Files:
src/sys/arch/i386/include: int_fmtio.h int_mwgwtypes.h
Log Message:
GCC sets up u?int_fast8_t to be int, so be consistent with it.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/include/int_fmtio.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/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/i386/include/int_fmtio.h
diff -u src/sys/arch/i386/include/int_fmtio.h:1.8 src/sys/arch/i386/include/int_fmtio.h:1.9
--- src/sys/arch/i386/include/int_fmtio.h:1.8 Fri Jul 25 21:43:13 2014
+++ src/sys/arch/i386/include/int_fmtio.h Mon Jul 28 11:22:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.8 2014/07/25 21:43:13 joerg Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.9 2014/07/28 11:22:46 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -144,7 +144,7 @@
#define SCNdLEAST16 "hd" /* int_least16_t */
#define SCNdLEAST32 "d" /* int_least32_t */
#define SCNdLEAST64 "lld" /* int_least64_t */
-#define SCNdFAST8 "hhd" /* int_fast8_t */
+#define SCNdFAST8 "d" /* int_fast8_t */
#define SCNdFAST16 "d" /* int_fast16_t */
#define SCNdFAST32 "d" /* int_fast32_t */
#define SCNdFAST64 "lld" /* int_fast64_t */
@@ -159,7 +159,7 @@
#define SCNiLEAST16 "hi" /* int_least16_t */
#define SCNiLEAST32 "i" /* int_least32_t */
#define SCNiLEAST64 "lli" /* int_least64_t */
-#define SCNiFAST8 "hhi" /* int_fast8_t */
+#define SCNiFAST8 "i" /* int_fast8_t */
#define SCNiFAST16 "i" /* int_fast16_t */
#define SCNiFAST32 "i" /* int_fast32_t */
#define SCNiFAST64 "lli" /* int_fast64_t */
@@ -176,7 +176,7 @@
#define SCNoLEAST16 "ho" /* uint_least16_t */
#define SCNoLEAST32 "o" /* uint_least32_t */
#define SCNoLEAST64 "llo" /* uint_least64_t */
-#define SCNoFAST8 "hho" /* uint_fast8_t */
+#define SCNoFAST8 "o" /* uint_fast8_t */
#define SCNoFAST16 "o" /* uint_fast16_t */
#define SCNoFAST32 "o" /* uint_fast32_t */
#define SCNoFAST64 "llo" /* uint_fast64_t */
@@ -191,7 +191,7 @@
#define SCNuLEAST16 "hu" /* uint_least16_t */
#define SCNuLEAST32 "u" /* uint_least32_t */
#define SCNuLEAST64 "llu" /* uint_least64_t */
-#define SCNuFAST8 "hhu" /* uint_fast8_t */
+#define SCNuFAST8 "u" /* uint_fast8_t */
#define SCNuFAST16 "u" /* uint_fast16_t */
#define SCNuFAST32 "u" /* uint_fast32_t */
#define SCNuFAST64 "llu" /* uint_fast64_t */
@@ -206,7 +206,7 @@
#define SCNxLEAST16 "hx" /* uint_least16_t */
#define SCNxLEAST32 "x" /* uint_least32_t */
#define SCNxLEAST64 "llx" /* uint_least64_t */
-#define SCNxFAST8 "hhx" /* uint_fast8_t */
+#define SCNxFAST8 "x" /* uint_fast8_t */
#define SCNxFAST16 "x" /* uint_fast16_t */
#define SCNxFAST32 "x" /* uint_fast32_t */
#define SCNxFAST64 "llx" /* uint_fast64_t */
Index: src/sys/arch/i386/include/int_mwgwtypes.h
diff -u src/sys/arch/i386/include/int_mwgwtypes.h:1.7 src/sys/arch/i386/include/int_mwgwtypes.h:1.8
--- src/sys/arch/i386/include/int_mwgwtypes.h:1.7 Fri Jul 25 21:43:13 2014
+++ src/sys/arch/i386/include/int_mwgwtypes.h Mon Jul 28 11:22:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_mwgwtypes.h,v 1.7 2014/07/25 21:43:13 joerg Exp $ */
+/* $NetBSD: int_mwgwtypes.h,v 1.8 2014/07/28 11:22:46 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -60,8 +60,8 @@ typedef unsigned long long int uint_leas
/* 7.18.1.3 Fastest minimum-width integer types */
-typedef signed char int_fast8_t;
-typedef unsigned char uint_fast8_t;
+typedef int int_fast8_t;
+typedef unsigned int uint_fast8_t;
typedef int int_fast16_t;
typedef unsigned int uint_fast16_t;
typedef int int_fast32_t;
