From 7befea740dfdc7d50e24351eaf1308071e9399ab Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 24 Mar 2015 10:42:45 +0100 Subject: 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 --- winsup/cygwin/include/stdint.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'winsup/cygwin/include/stdint.h') diff --git a/winsup/cygwin/include/stdint.h b/winsup/cygwin/include/stdint.h index 94b6b7673..7da9caf6f 100644 --- a/winsup/cygwin/include/stdint.h +++ b/winsup/cygwin/include/stdint.h @@ -1,6 +1,6 @@ /* 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. @@ -109,11 +109,6 @@ typedef long long intmax_t; typedef unsigned long long uintmax_t; #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__ # define __I64(n) n ## L # define __U64(n) n ## UL @@ -248,13 +243,6 @@ typedef unsigned long long uintmax_t; #define WINT_MAX (4294967295U) #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 */ #define INT8_C(x) x @@ -285,6 +273,4 @@ typedef unsigned long long uintmax_t; #define UINTMAX_C(x) x ## ULL #endif -#endif /* !__cplusplus || __STDC_CONSTANT_MACROS || __INSIDE_CYGWIN__ */ - #endif /* _STDINT_H */ -- cgit v1.2.3