Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / inttypes.h

diff --git a/include/inttypes.h b/include/inttypes.h
index ea731ec86898d0564b883038c48f9723217bc18c..dcb6785228c1ed6dbe19592cecffdaab6007c0a6 100644 (file)
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -23,30 +23,21 @@
 typedef __WCHAR_TYPE__ __gwchar_t;
 # else
 #  define __need_wchar_t
-#  include <stddef.h>
+#  include <linux/stddef.h>
 typedef wchar_t __gwchar_t;
 # endif
 # define ____gwchar_t_defined  1
 #endif
 
-
-/* The ISO C99 standard specifies that these macros must only be
-   defined if explicitly requested.  */
+/*
+ * The ISO C99 standard specifies that these macros must only be defined if
+ * explicitly requested
+ */
 #if !defined __cplusplus || defined __STDC_FORMAT_MACROS
 
-#ifdef CONFIG_USE_STDINT
-# if __WORDSIZE == 64
-#  define __PRI64_PREFIX       "l"
-#  define __PRIPTR_PREFIX      "l"
-# else
-#  define __PRI64_PREFIX       "ll"
-#  define __PRIPTR_PREFIX
-# endif
-#else
 /* linux/types.h always uses long long for 64-bit and long for uintptr_t */
 # define __PRI64_PREFIX        "ll"
 # define __PRIPTR_PREFIX       "l"
-#endif
 
 /* Macros for printing format specifiers.  */
 
@@ -66,7 +57,6 @@ typedef wchar_t __gwchar_t;
 # define PRIdFAST32    __PRIPTR_PREFIX "d"
 # define PRIdFAST64    __PRI64_PREFIX "d"
 
-
 # define PRIi8         "i"
 # define PRIi16                "i"
 # define PRIi32                "i"
@@ -146,7 +136,6 @@ typedef wchar_t __gwchar_t;
 # define PRIXFAST32    __PRIPTR_PREFIX "X"
 # define PRIXFAST64    __PRI64_PREFIX "X"
 
-
 /* Macros for printing `intmax_t' and `uintmax_t'.  */
 # define PRIdMAX       __PRI64_PREFIX "d"
 # define PRIiMAX       __PRI64_PREFIX "i"
@@ -155,7 +144,6 @@ typedef wchar_t __gwchar_t;
 # define PRIxMAX       __PRI64_PREFIX "x"
 # define PRIXMAX       __PRI64_PREFIX "X"
 
-
 /* Macros for printing `intptr_t' and `uintptr_t'.  */
 # define PRIdPTR       __PRIPTR_PREFIX "d"
 # define PRIiPTR       __PRIPTR_PREFIX "i"
@@ -164,7 +152,6 @@ typedef wchar_t __gwchar_t;
 # define PRIxPTR       __PRIPTR_PREFIX "x"
 # define PRIXPTR       __PRIPTR_PREFIX "X"
 
-
 /* Macros for scanning format specifiers.  */
 
 /* Signed decimal notation.  */
@@ -247,7 +234,6 @@ typedef wchar_t __gwchar_t;
 # define SCNxFAST32    __PRIPTR_PREFIX "x"
 # define SCNxFAST64    __PRI64_PREFIX "x"
 
-
 /* Macros for scanning `intmax_t' and `uintmax_t'.  */
 # define SCNdMAX       __PRI64_PREFIX "d"
 # define SCNiMAX       __PRI64_PREFIX "i"
@@ -255,7 +241,7 @@ typedef wchar_t __gwchar_t;
 # define SCNuMAX       __PRI64_PREFIX "u"
 # define SCNxMAX       __PRI64_PREFIX "x"
 
-/* Macros for scaning `intptr_t' and `uintptr_t'.  */
+/* Macros for scanning `intptr_t' and `uintptr_t'.  */
 # define SCNdPTR       __PRIPTR_PREFIX "d"
 # define SCNiPTR       __PRIPTR_PREFIX "i"
 # define SCNoPTR       __PRIPTR_PREFIX "o"
@@ -264,7 +250,6 @@ typedef wchar_t __gwchar_t;
 
 #endif /* C++ && format macros */
 
-
 #if __WORDSIZE == 64
 
 /* We have to define the `uintmax_t' type using `ldiv_t'.  */