Ignore __STDC_{FORMAT,LIMIT,CONSTANT}_MACROS
Per glibc BZ #15366: * inttypes.h: Drop __STDC_FORMAT_MACROS consideration. * stdint.h: Drop __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS consideration. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
parent
ef23a12ff8
commit
57a78e23fd
|
@ -1,3 +1,10 @@
|
||||||
|
2015-03-24 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
Per glibc BZ #15366:
|
||||||
|
* inttypes.h: Drop __STDC_FORMAT_MACROS consideration.
|
||||||
|
* stdint.h: Drop __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS
|
||||||
|
consideration.
|
||||||
|
|
||||||
2015-03-23 Corinna Vinschen <corinna@vinschen.de>
|
2015-03-23 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* include/cygwin/_types.h: Drop unused file.
|
* include/cygwin/_types.h: Drop unused file.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* inttypes.h - fixed size integer types
|
/* inttypes.h - fixed size integer types
|
||||||
|
|
||||||
Copyright 2003, 2005, 2009, 2010, 2012 Red Hat, Inc.
|
Copyright 2003, 2005, 2009, 2010, 2012, 2015 Red Hat, Inc.
|
||||||
|
|
||||||
This file is part of Cygwin.
|
This file is part of Cygwin.
|
||||||
|
|
||||||
|
@ -16,11 +16,6 @@ details. */
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <bits/wordsize.h>
|
#include <bits/wordsize.h>
|
||||||
|
|
||||||
/* C99 requires that in C++ the following macros should be defined only
|
|
||||||
if requested. */
|
|
||||||
#if !defined (__cplusplus) || defined (__STDC_FORMAT_MACROS) \
|
|
||||||
|| defined (__INSIDE_CYGWIN__)
|
|
||||||
|
|
||||||
#if __WORDSIZE == 64
|
#if __WORDSIZE == 64
|
||||||
#define __PRI64 "l"
|
#define __PRI64 "l"
|
||||||
#define __PRIFAST "l"
|
#define __PRIFAST "l"
|
||||||
|
@ -247,8 +242,6 @@ details. */
|
||||||
#define SCNxMAX __SCN64 "x"
|
#define SCNxMAX __SCN64 "x"
|
||||||
#define SCNxPTR __SCNPTR "x"
|
#define SCNxPTR __SCNPTR "x"
|
||||||
|
|
||||||
#endif /* !__cplusplus || __STDC_FORMAT_MACROS || __INSIDE_CYGWIN__ */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* stdint.h - integer types
|
/* stdint.h - integer types
|
||||||
|
|
||||||
Copyright 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Red Hat, Inc.
|
Copyright 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2012 2015 Red Hat, Inc.
|
||||||
|
|
||||||
This file is part of Cygwin.
|
This file is part of Cygwin.
|
||||||
|
|
||||||
|
@ -109,11 +109,6 @@ typedef long long intmax_t;
|
||||||
typedef unsigned long long uintmax_t;
|
typedef unsigned long long uintmax_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* C99 requires that in C++ the following macros should be defined only
|
|
||||||
if requested. */
|
|
||||||
#if !defined (__cplusplus) || defined (__STDC_LIMIT_MACROS) \
|
|
||||||
|| defined (__INSIDE_CYGWIN__)
|
|
||||||
|
|
||||||
#ifdef __x86_64__
|
#ifdef __x86_64__
|
||||||
# define __I64(n) n ## L
|
# define __I64(n) n ## L
|
||||||
# define __U64(n) n ## UL
|
# define __U64(n) n ## UL
|
||||||
|
@ -248,13 +243,6 @@ typedef unsigned long long uintmax_t;
|
||||||
#define WINT_MAX (4294967295U)
|
#define WINT_MAX (4294967295U)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* !__cplusplus || __STDC_LIMIT_MACROS || __INSIDE_CYGWIN__ */
|
|
||||||
|
|
||||||
/* C99 requires that in C++ the following macros should be defined only
|
|
||||||
if requested. */
|
|
||||||
#if !defined (__cplusplus) || defined (__STDC_CONSTANT_MACROS) \
|
|
||||||
|| defined (__INSIDE_CYGWIN__)
|
|
||||||
|
|
||||||
/* Macros for minimum-width integer constant expressions */
|
/* Macros for minimum-width integer constant expressions */
|
||||||
|
|
||||||
#define INT8_C(x) x
|
#define INT8_C(x) x
|
||||||
|
@ -285,6 +273,4 @@ typedef unsigned long long uintmax_t;
|
||||||
#define UINTMAX_C(x) x ## ULL
|
#define UINTMAX_C(x) x ## ULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* !__cplusplus || __STDC_CONSTANT_MACROS || __INSIDE_CYGWIN__ */
|
|
||||||
|
|
||||||
#endif /* _STDINT_H */
|
#endif /* _STDINT_H */
|
||||||
|
|
Loading…
Reference in New Issue