00db10
commit 1ef74943ce2f114c78b215af57c2ccc72ccdb0b7
00db10
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
00db10
Date:   Thu Apr 25 11:08:31 2013 -0700
00db10
00db10
    Get rid of __STDC_FORMAT_MACROS, __STDC_LIMIT_MACROS and
00db10
    __STDC_CONSTANT_MACROS.
00db10
00db10
--- glibc-2.17-c758a686/sysdeps/generic/inttypes.h
00db10
+++ glibc-2.17-c758a686/sysdeps/generic/inttypes.h
00db10
@@ -41,10 +41,6 @@
00db10
 #endif
00db10
 
00db10
 
00db10
-/* The ISO C99 standard specifies that these macros must only be
00db10
-   defined if explicitly requested.  */
00db10
-#if !defined __cplusplus || defined __STDC_FORMAT_MACROS
00db10
-
00db10
 # if __WORDSIZE == 64
00db10
 #  define __PRI64_PREFIX	"l"
00db10
 #  define __PRIPTR_PREFIX	"l"
00db10
@@ -267,8 +263,6 @@
00db10
 # define SCNuPTR	__PRIPTR_PREFIX "u"
00db10
 # define SCNxPTR	__PRIPTR_PREFIX "x"
00db10
 
00db10
-#endif	/* C++ && format macros */
00db10
-
00db10
 
00db10
 __BEGIN_DECLS
00db10
 
00db10
--- glibc-2.17-c758a686/sysdeps/generic/stdint.h
00db10
+++ glibc-2.17-c758a686/sysdeps/generic/stdint.h
00db10
@@ -141,10 +141,6 @@
00db10
 #endif
00db10
 
00db10
 
00db10
-/* The ISO C99 standard specifies that in C++ implementations these
00db10
-   macros should only be defined if explicitly requested.  */
00db10
-#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
00db10
-
00db10
 # if __WORDSIZE == 64
00db10
 #  define __INT64_C(c)	c ## L
00db10
 #  define __UINT64_C(c)	c ## UL
00db10
@@ -278,12 +274,6 @@
00db10
 # define WINT_MIN		(0u)
00db10
 # define WINT_MAX		(4294967295u)
00db10
 
00db10
-#endif	/* C++ && limit macros */
00db10
-
00db10
-
00db10
-/* The ISO C99 standard specifies that in C++ implementations these
00db10
-   should only be defined if explicitly requested.  */
00db10
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
00db10
 
00db10
 /* Signed.  */
00db10
 # define INT8_C(c)	c
00db10
@@ -314,6 +304,4 @@
00db10
 #  define UINTMAX_C(c)	c ## ULL
00db10
 # endif
00db10
 
00db10
-#endif	/* C++ && constant macros */
00db10
-
00db10
 #endif /* stdint.h */