Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/m68k/include Revert previous (SCN*FAST*) and make P...



details:   https://anonhg.NetBSD.org/src/rev/f9ea38c6d30a
branches:  trunk
changeset: 331636:f9ea38c6d30a
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 17 20:22:41 2014 +0000

description:
Revert previous (SCN*FAST*) and make PRI*FAST* identical.
Should fix the default (gcc 4.5 based) build.

diffstat:

 sys/arch/m68k/include/int_fmtio.h |  46 +++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diffs (130 lines):

diff -r 60bcda2e0fc8 -r f9ea38c6d30a sys/arch/m68k/include/int_fmtio.h
--- a/sys/arch/m68k/include/int_fmtio.h Sun Aug 17 19:28:46 2014 +0000
+++ b/sys/arch/m68k/include/int_fmtio.h Sun Aug 17 20:22:41 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: int_fmtio.h,v 1.5 2014/08/15 08:59:58 martin Exp $     */
+/*     $NetBSD: int_fmtio.h,v 1.6 2014/08/17 20:22:41 martin Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@
 #define        PRIdLEAST16     "d"     /* int_least16_t        */
 #define        PRIdLEAST32     "d"     /* int_least32_t        */
 #define        PRIdLEAST64     "lld"   /* int_least64_t        */
-#define        PRIdFAST8       "d"     /* int_fast8_t          */
-#define        PRIdFAST16      "d"     /* int_fast16_t         */
+#define        PRIdFAST8       "hhd"   /* int_fast8_t          */
+#define        PRIdFAST16      "hd"    /* int_fast16_t         */
 #define        PRIdFAST32      "d"     /* int_fast32_t         */
 #define        PRIdFAST64      "lld"   /* int_fast64_t         */
 #define        PRIdMAX         "lld"   /* intmax_t             */
@@ -64,8 +64,8 @@
 #define        PRIiLEAST16     "i"     /* int_least16_t        */
 #define        PRIiLEAST32     "i"     /* int_least32_t        */
 #define        PRIiLEAST64     "lli"   /* int_least64_t        */
-#define        PRIiFAST8       "i"     /* int_fast8_t          */
-#define        PRIiFAST16      "i"     /* int_fast16_t         */
+#define        PRIiFAST8       "hhi"   /* int_fast8_t          */
+#define        PRIiFAST16      "hi"    /* int_fast16_t         */
 #define        PRIiFAST32      "i"     /* int_fast32_t         */
 #define        PRIiFAST64      "lli"   /* int_fast64_t         */
 #define        PRIiMAX         "lli"   /* intmax_t             */
@@ -81,8 +81,8 @@
 #define        PRIoLEAST16     "o"     /* uint_least16_t       */
 #define        PRIoLEAST32     "o"     /* uint_least32_t       */
 #define        PRIoLEAST64     "llo"   /* uint_least64_t       */
-#define        PRIoFAST8       "o"     /* uint_fast8_t         */
-#define        PRIoFAST16      "o"     /* uint_fast16_t        */
+#define        PRIoFAST8       "hho"   /* uint_fast8_t         */
+#define        PRIoFAST16      "ho"    /* uint_fast16_t        */
 #define        PRIoFAST32      "o"     /* uint_fast32_t        */
 #define        PRIoFAST64      "llo"   /* uint_fast64_t        */
 #define        PRIoMAX         "llo"   /* uintmax_t            */
@@ -96,8 +96,8 @@
 #define        PRIuLEAST16     "u"     /* uint_least16_t       */
 #define        PRIuLEAST32     "u"     /* uint_least32_t       */
 #define        PRIuLEAST64     "llu"   /* uint_least64_t       */
-#define        PRIuFAST8       "u"     /* uint_fast8_t         */
-#define        PRIuFAST16      "u"     /* uint_fast16_t        */
+#define        PRIuFAST8       "hhu"   /* uint_fast8_t         */
+#define        PRIuFAST16      "hu"    /* uint_fast16_t        */
 #define        PRIuFAST32      "u"     /* uint_fast32_t        */
 #define        PRIuFAST64      "llu"   /* uint_fast64_t        */
 #define        PRIuMAX         "llu"   /* uintmax_t            */
@@ -111,8 +111,8 @@
 #define        PRIxLEAST16     "x"     /* uint_least16_t       */
 #define        PRIxLEAST32     "x"     /* uint_least32_t       */
 #define        PRIxLEAST64     "llx"   /* uint_least64_t       */
-#define        PRIxFAST8       "x"     /* uint_fast8_t         */
-#define        PRIxFAST16      "x"     /* uint_fast16_t        */
+#define        PRIxFAST8       "hhx"   /* uint_fast8_t         */
+#define        PRIxFAST16      "hx"    /* uint_fast16_t        */
 #define        PRIxFAST32      "x"     /* uint_fast32_t        */
 #define        PRIxFAST64      "llx"   /* uint_fast64_t        */
 #define        PRIxMAX         "llx"   /* uintmax_t            */
@@ -126,8 +126,8 @@
 #define        PRIXLEAST16     "X"     /* uint_least16_t       */
 #define        PRIXLEAST32     "X"     /* uint_least32_t       */
 #define        PRIXLEAST64     "llX"   /* uint_least64_t       */
-#define        PRIXFAST8       "X"     /* uint_fast8_t         */
-#define        PRIXFAST16      "X"     /* uint_fast16_t        */
+#define        PRIXFAST8       "hhX"   /* uint_fast8_t         */
+#define        PRIXFAST16      "hX"    /* uint_fast16_t        */
 #define        PRIXFAST32      "X"     /* uint_fast32_t        */
 #define        PRIXFAST64      "llX"   /* uint_fast64_t        */
 #define        PRIXMAX         "llX"   /* uintmax_t            */
@@ -143,8 +143,8 @@
 #define        SCNdLEAST16     "hd"    /* int_least16_t        */
 #define        SCNdLEAST32     "d"     /* int_least32_t        */
 #define        SCNdLEAST64     "lld"   /* int_least64_t        */
-#define        SCNdFAST8       "d"     /* int_fast8_t          */
-#define        SCNdFAST16      "d"     /* int_fast16_t         */
+#define        SCNdFAST8       "hhd"   /* int_fast8_t          */
+#define        SCNdFAST16      "hd"    /* int_fast16_t         */
 #define        SCNdFAST32      "d"     /* int_fast32_t         */
 #define        SCNdFAST64      "lld"   /* int_fast64_t         */
 #define        SCNdMAX         "lld"   /* intmax_t             */
@@ -158,8 +158,8 @@
 #define        SCNiLEAST16     "hi"    /* int_least16_t        */
 #define        SCNiLEAST32     "i"     /* int_least32_t        */
 #define        SCNiLEAST64     "lli"   /* int_least64_t        */
-#define        SCNiFAST8       "i"     /* int_fast8_t          */
-#define        SCNiFAST16      "i"     /* int_fast16_t         */
+#define        SCNiFAST8       "hhi"   /* int_fast8_t          */
+#define        SCNiFAST16      "hi"    /* int_fast16_t         */
 #define        SCNiFAST32      "i"     /* int_fast32_t         */
 #define        SCNiFAST64      "lli"   /* int_fast64_t         */
 #define        SCNiMAX         "lli"   /* intmax_t             */
@@ -175,8 +175,8 @@
 #define        SCNoLEAST16     "ho"    /* uint_least16_t       */
 #define        SCNoLEAST32     "o"     /* uint_least32_t       */
 #define        SCNoLEAST64     "llo"   /* uint_least64_t       */
-#define        SCNoFAST8       "o"     /* uint_fast8_t         */
-#define        SCNoFAST16      "o"     /* uint_fast16_t        */
+#define        SCNoFAST8       "hho"   /* uint_fast8_t         */
+#define        SCNoFAST16      "ho"    /* uint_fast16_t        */
 #define        SCNoFAST32      "o"     /* uint_fast32_t        */
 #define        SCNoFAST64      "llo"   /* uint_fast64_t        */
 #define        SCNoMAX         "llo"   /* uintmax_t            */
@@ -190,8 +190,8 @@
 #define        SCNuLEAST16     "hu"    /* uint_least16_t       */
 #define        SCNuLEAST32     "u"     /* uint_least32_t       */
 #define        SCNuLEAST64     "llu"   /* uint_least64_t       */
-#define        SCNuFAST8       "u"     /* uint_fast8_t         */
-#define        SCNuFAST16      "u"     /* uint_fast16_t        */
+#define        SCNuFAST8       "hhu"   /* uint_fast8_t         */
+#define        SCNuFAST16      "hu"    /* uint_fast16_t        */
 #define        SCNuFAST32      "u"     /* uint_fast32_t        */
 #define        SCNuFAST64      "llu"   /* uint_fast64_t        */
 #define        SCNuMAX         "llu"   /* uintmax_t            */
@@ -205,8 +205,8 @@
 #define        SCNxLEAST16     "hx"    /* uint_least16_t       */
 #define        SCNxLEAST32     "x"     /* uint_least32_t       */
 #define        SCNxLEAST64     "llx"   /* uint_least64_t       */
-#define        SCNxFAST8       "x"     /* uint_fast8_t         */
-#define        SCNxFAST16      "x"     /* uint_fast16_t        */
+#define        SCNxFAST8       "hhx"   /* uint_fast8_t         */
+#define        SCNxFAST16      "hx"    /* uint_fast16_t        */
 #define        SCNxFAST32      "x"     /* uint_fast32_t        */
 #define        SCNxFAST64      "llx"   /* uint_fast64_t        */
 #define        SCNxMAX         "llx"   /* uintmax_t            */



Home | Main Index | Thread Index | Old Index