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