summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/inttypes.h7
-rw-r--r--include/stdint.h12
2 files changed, 0 insertions, 19 deletions
diff --git a/include/inttypes.h b/include/inttypes.h
index fa6339869..15e0b59a5 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -42,11 +42,6 @@ typedef wchar_t __gwchar_t;
#endif
#endif
-
-/* The ISO C99 standard specifies that these macros must only be
- defined if explicitly requested. */
-#if !defined __cplusplus || defined __STDC_FORMAT_MACROS
-
# if __WORDSIZE == 64
# define __PRI64_PREFIX "l"
# define __PRIPTR_PREFIX "l"
@@ -269,8 +264,6 @@ typedef wchar_t __gwchar_t;
# define SCNuPTR __PRIPTR_PREFIX "u"
# define SCNxPTR __PRIPTR_PREFIX "x"
-#endif /* C++ && format macros */
-
__BEGIN_DECLS
diff --git a/include/stdint.h b/include/stdint.h
index 9ca84453c..749f73697 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -143,10 +143,6 @@ typedef unsigned long long int uintmax_t;
#endif
-/* The ISO C99 standard specifies that in C++ implementations these
- macros should only be defined if explicitly requested. */
-#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
-
# if __WORDSIZE == 64
# define __INT64_C(c) c ## L
# define __UINT64_C(c) c ## UL
@@ -281,12 +277,6 @@ typedef unsigned long long int uintmax_t;
# define WINT_MAX (4294967295u)
#endif /* __UCLIBC_HAS_WCHAR__ */
-#endif /* C++ && limit macros */
-
-
-/* The ISO C99 standard specifies that in C++ implementations these
- should only be defined if explicitly requested. */
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
/* Signed. */
# define INT8_C(c) c
@@ -317,6 +307,4 @@ typedef unsigned long long int uintmax_t;
# define UINTMAX_C(c) c ## ULL
# endif
-#endif /* C++ && constant macros */
-
#endif /* stdint.h */