From: Rich Felker <dalias@aerifal.cx>
Date: Fri, 17 May 2013 18:23:41 +0000 (-0400)
Subject: remove the __STDC_FORMAT_MACROS nonsense from inttypes.h
X-Git-Tag: v0.9.11~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ec9f5353b10eb312af391ec799a3eeea5da145a9;p=oweals%2Fmusl.git

remove the __STDC_FORMAT_MACROS nonsense from inttypes.h

somehow I missed this when removing the corresponding
__STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS nonsense from stdint.h.
these were all attempts by the C committee to guess what the C++
committee would want, and the guesses turned out to be wrong.
---

diff --git a/include/inttypes.h b/include/inttypes.h
index 05d54ba0..c51769fa 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -22,8 +22,6 @@ uintmax_t strtoumax(const char *__restrict, char **__restrict, int);
 intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
 uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
 
-#if !defined __cplusplus || defined __STDC_FORMAT_MACROS
-
 #if UINTPTR_MAX == UINT64_MAX
 #define __PRI64  "l"
 #else
@@ -221,8 +219,6 @@ uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
 #define SCNuPTR "lu"
 #define SCNxPTR "lx"
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif