Drop local stdint.h and inttypes.h in favor of newlib files
* include/cygwin/types.h: Include sys/_stdint.h rather than stdint.h. * include/stdint.h: Drop in favor of newlib version. * include/inttypes.h: Ditto. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
parent
b574832830
commit
b5fdd3cd8e
|
|
@ -1,3 +1,9 @@
|
|||
2015-04-01 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* include/cygwin/types.h: Include sys/_stdint.h rather than stdint.h.
|
||||
* include/stdint.h: Drop in favor of newlib version.
|
||||
* include/inttypes.h: Ditto.
|
||||
|
||||
2015-04-01 Jon TURNEY <jon.turney@dronecode.org.uk>
|
||||
|
||||
* include/sys/ucontext.h : New header.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ extern "C"
|
|||
{
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sys/_stdint.h>
|
||||
#include <endian.h>
|
||||
#include <bits/wordsize.h>
|
||||
#include <sys/_timespec.h>
|
||||
|
|
|
|||
|
|
@ -1,267 +0,0 @@
|
|||
/* inttypes.h - fixed size integer types
|
||||
|
||||
Copyright 2003, 2005, 2009, 2010, 2012, 2015 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
This software is a copyrighted work licensed under the terms of the
|
||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
details. */
|
||||
|
||||
#ifndef _INTTYPES_H
|
||||
#define _INTTYPES_H
|
||||
|
||||
#include <stdint.h>
|
||||
#define __need_wchar_t
|
||||
#include <stddef.h>
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
#define __PRI64 "l"
|
||||
#define __PRIFAST "l"
|
||||
#define __PRIPTR "l"
|
||||
#else
|
||||
#define __PRI64 "ll"
|
||||
#define __PRIFAST
|
||||
#define __PRIPTR
|
||||
#endif
|
||||
|
||||
/* fprintf() macros for signed integers */
|
||||
|
||||
#define PRId8 "d"
|
||||
#define PRId16 "d"
|
||||
#define PRId32 "d"
|
||||
#define PRId64 __PRI64 "d"
|
||||
|
||||
#define PRIdLEAST8 "d"
|
||||
#define PRIdLEAST16 "d"
|
||||
#define PRIdLEAST32 "d"
|
||||
#define PRIdLEAST64 __PRI64 "d"
|
||||
|
||||
#define PRIdFAST8 "d"
|
||||
#define PRIdFAST16 __PRIFAST "d"
|
||||
#define PRIdFAST32 __PRIFAST "d"
|
||||
#define PRIdFAST64 __PRI64 "d"
|
||||
|
||||
#define PRIdMAX __PRI64 "d"
|
||||
#define PRIdPTR __PRIPTR "d"
|
||||
|
||||
#define PRIi8 "i"
|
||||
#define PRIi16 "i"
|
||||
#define PRIi32 "i"
|
||||
#define PRIi64 __PRI64 "i"
|
||||
|
||||
#define PRIiLEAST8 "i"
|
||||
#define PRIiLEAST16 "i"
|
||||
#define PRIiLEAST32 "i"
|
||||
#define PRIiLEAST64 __PRI64 "i"
|
||||
|
||||
#define PRIiFAST8 "i"
|
||||
#define PRIiFAST16 __PRIFAST "i"
|
||||
#define PRIiFAST32 __PRIFAST "i"
|
||||
#define PRIiFAST64 __PRI64 "i"
|
||||
|
||||
#define PRIiMAX __PRI64 "i"
|
||||
#define PRIiPTR __PRIPTR "i"
|
||||
|
||||
/* fprintf() macros for unsigned integers */
|
||||
|
||||
#define PRIo8 "o"
|
||||
#define PRIo16 "o"
|
||||
#define PRIo32 "o"
|
||||
#define PRIo64 __PRI64 "o"
|
||||
|
||||
#define PRIoLEAST8 "o"
|
||||
#define PRIoLEAST16 "o"
|
||||
#define PRIoLEAST32 "o"
|
||||
#define PRIoLEAST64 __PRI64 "o"
|
||||
|
||||
#define PRIoFAST8 "o"
|
||||
#define PRIoFAST16 __PRIFAST "o"
|
||||
#define PRIoFAST32 __PRIFAST "o"
|
||||
#define PRIoFAST64 __PRI64 "o"
|
||||
|
||||
#define PRIoMAX __PRI64 "o"
|
||||
#define PRIoPTR __PRIPTR "o"
|
||||
|
||||
#define PRIu8 "u"
|
||||
#define PRIu16 "u"
|
||||
#define PRIu32 "u"
|
||||
#define PRIu64 __PRI64 "u"
|
||||
|
||||
#define PRIuLEAST8 "u"
|
||||
#define PRIuLEAST16 "u"
|
||||
#define PRIuLEAST32 "u"
|
||||
#define PRIuLEAST64 __PRI64 "u"
|
||||
|
||||
#define PRIuFAST8 "u"
|
||||
#define PRIuFAST16 __PRIFAST "u"
|
||||
#define PRIuFAST32 __PRIFAST "u"
|
||||
#define PRIuFAST64 __PRI64 "u"
|
||||
|
||||
#define PRIuMAX __PRI64 "u"
|
||||
#define PRIuPTR __PRIPTR "u"
|
||||
|
||||
#define PRIx8 "x"
|
||||
#define PRIx16 "x"
|
||||
#define PRIx32 "x"
|
||||
#define PRIx64 __PRI64 "x"
|
||||
|
||||
#define PRIxLEAST8 "x"
|
||||
#define PRIxLEAST16 "x"
|
||||
#define PRIxLEAST32 "x"
|
||||
#define PRIxLEAST64 __PRI64 "x"
|
||||
|
||||
#define PRIxFAST8 "x"
|
||||
#define PRIxFAST16 __PRIFAST "x"
|
||||
#define PRIxFAST32 __PRIFAST "x"
|
||||
#define PRIxFAST64 __PRI64 "x"
|
||||
|
||||
#define PRIxMAX __PRI64 "x"
|
||||
#define PRIxPTR __PRIPTR "x"
|
||||
|
||||
#define PRIX8 "X"
|
||||
#define PRIX16 "X"
|
||||
#define PRIX32 "X"
|
||||
#define PRIX64 __PRI64 "X"
|
||||
|
||||
#define PRIXLEAST8 "X"
|
||||
#define PRIXLEAST16 "X"
|
||||
#define PRIXLEAST32 "X"
|
||||
#define PRIXLEAST64 __PRI64 "X"
|
||||
|
||||
#define PRIXFAST8 "X"
|
||||
#define PRIXFAST16 __PRIFAST "X"
|
||||
#define PRIXFAST32 __PRIFAST "X"
|
||||
#define PRIXFAST64 __PRI64 "X"
|
||||
|
||||
#define PRIXMAX __PRI64 "X"
|
||||
#define PRIXPTR __PRIPTR "X"
|
||||
|
||||
/* fscanf() macros for signed integers */
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
#define __SCN64 "l"
|
||||
#define __SCNFAST "l"
|
||||
#define __SCNPTR "l"
|
||||
#else
|
||||
#define __SCN64 "ll"
|
||||
#define __SCNFAST
|
||||
#define __SCNPTR
|
||||
#endif
|
||||
|
||||
#define SCNd8 "hhd"
|
||||
#define SCNd16 "hd"
|
||||
#define SCNd32 "d"
|
||||
#define SCNd64 __SCN64 "d"
|
||||
|
||||
#define SCNdLEAST8 "hhd"
|
||||
#define SCNdLEAST16 "hd"
|
||||
#define SCNdLEAST32 "d"
|
||||
#define SCNdLEAST64 __SCN64 "d"
|
||||
|
||||
#define SCNdFAST8 "hhd"
|
||||
#define SCNdFAST16 __SCNFAST "d"
|
||||
#define SCNdFAST32 __SCNFAST "d"
|
||||
#define SCNdFAST64 __SCN64 "d"
|
||||
|
||||
#define SCNdMAX __SCN64 "d"
|
||||
#define SCNdPTR __SCNPTR "d"
|
||||
|
||||
#define SCNi8 "hhi"
|
||||
#define SCNi16 "hi"
|
||||
#define SCNi32 "i"
|
||||
#define SCNi64 __SCN64 "i"
|
||||
|
||||
#define SCNiLEAST8 "hhi"
|
||||
#define SCNiLEAST16 "hi"
|
||||
#define SCNiLEAST32 "i"
|
||||
#define SCNiLEAST64 __SCN64 "i"
|
||||
|
||||
#define SCNiFAST8 "hhi"
|
||||
#define SCNiFAST16 __SCNFAST "i"
|
||||
#define SCNiFAST32 __SCNFAST "i"
|
||||
#define SCNiFAST64 __SCN64 "i"
|
||||
|
||||
#define SCNiMAX __SCN64 "i"
|
||||
#define SCNiPTR __SCNPTR "i"
|
||||
|
||||
/* fscanf() macros for unsigned integers */
|
||||
|
||||
#define SCNo8 "hho"
|
||||
#define SCNo16 "ho"
|
||||
#define SCNo32 "o"
|
||||
#define SCNo64 __SCN64 "o"
|
||||
|
||||
#define SCNoLEAST8 "hho"
|
||||
#define SCNoLEAST16 "ho"
|
||||
#define SCNoLEAST32 "o"
|
||||
#define SCNoLEAST64 __SCN64 "o"
|
||||
|
||||
#define SCNoFAST8 "hho"
|
||||
#define SCNoFAST16 __SCNFAST "o"
|
||||
#define SCNoFAST32 __SCNFAST "o"
|
||||
#define SCNoFAST64 __SCN64 "o"
|
||||
|
||||
#define SCNoMAX __SCN64 "o"
|
||||
#define SCNoPTR __SCNPTR "o"
|
||||
|
||||
#define SCNu8 "hhu"
|
||||
#define SCNu16 "hu"
|
||||
#define SCNu32 "u"
|
||||
#define SCNu64 __SCN64 "u"
|
||||
|
||||
#define SCNuLEAST8 "hhu"
|
||||
#define SCNuLEAST16 "hu"
|
||||
#define SCNuLEAST32 "u"
|
||||
#define SCNuLEAST64 __SCN64 "u"
|
||||
|
||||
#define SCNuFAST8 "hhu"
|
||||
#define SCNuFAST16 __SCNFAST "u"
|
||||
#define SCNuFAST32 __SCNFAST "u"
|
||||
#define SCNuFAST64 __SCN64 "u"
|
||||
|
||||
#define SCNuMAX __SCN64 "u"
|
||||
#define SCNuPTR __SCNPTR "u"
|
||||
|
||||
#define SCNx8 "hhx"
|
||||
#define SCNx16 "hx"
|
||||
#define SCNx32 "x"
|
||||
#define SCNx64 __SCN64 "x"
|
||||
|
||||
#define SCNxLEAST8 "hhx"
|
||||
#define SCNxLEAST16 "hx"
|
||||
#define SCNxLEAST32 "x"
|
||||
#define SCNxLEAST64 __SCN64 "x"
|
||||
|
||||
#define SCNxFAST8 "hhx"
|
||||
#define SCNxFAST16 __SCNFAST "x"
|
||||
#define SCNxFAST32 __SCNFAST "x"
|
||||
#define SCNxFAST64 __SCN64 "x"
|
||||
|
||||
#define SCNxMAX __SCN64 "x"
|
||||
#define SCNxPTR __SCNPTR "x"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <_ansi.h>
|
||||
|
||||
typedef struct {
|
||||
intmax_t quot;
|
||||
intmax_t rem;
|
||||
} imaxdiv_t;
|
||||
|
||||
intmax_t _EXFUN(imaxabs, (intmax_t));
|
||||
imaxdiv_t _EXFUN(imaxdiv, (intmax_t, intmax_t));
|
||||
intmax_t _EXFUN(strtoimax, (const char *, char **, int));
|
||||
uintmax_t _EXFUN(strtoumax, (const char *, char **, int));
|
||||
intmax_t _EXFUN(wcstoimax, (const wchar_t *, wchar_t **, int));
|
||||
uintmax_t _EXFUN(wcstoumax, (const wchar_t *, wchar_t **, int));
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _INTTYPES_H */
|
||||
|
|
@ -1,276 +0,0 @@
|
|||
/* stdint.h - integer types
|
||||
|
||||
Copyright 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2012 2015 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
This software is a copyrighted work licensed under the terms of the
|
||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
details. */
|
||||
|
||||
#ifndef _STDINT_H
|
||||
#define _STDINT_H
|
||||
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
/* Exact-width integer types */
|
||||
|
||||
#ifndef __int8_t_defined
|
||||
#define __int8_t_defined
|
||||
typedef signed char int8_t;
|
||||
typedef short int16_t;
|
||||
typedef int int32_t;
|
||||
#if __WORDSIZE == 64
|
||||
typedef long int64_t;
|
||||
#else
|
||||
typedef long long int64_t;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
typedef unsigned char uint8_t;
|
||||
typedef unsigned short uint16_t;
|
||||
#ifndef __uint32_t_defined
|
||||
#define __uint32_t_defined
|
||||
typedef unsigned int uint32_t;
|
||||
#endif
|
||||
#if __WORDSIZE == 64
|
||||
typedef unsigned long uint64_t;
|
||||
#else
|
||||
typedef unsigned long long uint64_t;
|
||||
#endif
|
||||
|
||||
/* Minimum-width integer types */
|
||||
|
||||
typedef signed char int_least8_t;
|
||||
typedef short int_least16_t;
|
||||
typedef int int_least32_t;
|
||||
#if __WORDSIZE == 64
|
||||
typedef long int_least64_t;
|
||||
#else
|
||||
typedef long long int_least64_t;
|
||||
#endif
|
||||
|
||||
typedef unsigned char uint_least8_t;
|
||||
typedef unsigned short uint_least16_t;
|
||||
typedef unsigned int uint_least32_t;
|
||||
#if __WORDSIZE == 64
|
||||
typedef unsigned long uint_least64_t;
|
||||
#else
|
||||
typedef unsigned long long uint_least64_t;
|
||||
#endif
|
||||
|
||||
/* Fastest minimum-width integer types */
|
||||
|
||||
typedef signed char int_fast8_t;
|
||||
#if __WORDSIZE == 64
|
||||
typedef long int_fast16_t;
|
||||
typedef long int_fast32_t;
|
||||
typedef long int_fast64_t;
|
||||
#else
|
||||
typedef int int_fast16_t;
|
||||
typedef int int_fast32_t;
|
||||
typedef long long int_fast64_t;
|
||||
#endif
|
||||
|
||||
typedef unsigned char uint_fast8_t;
|
||||
#if __WORDSIZE == 64
|
||||
typedef unsigned long uint_fast16_t;
|
||||
typedef unsigned long uint_fast32_t;
|
||||
typedef unsigned long uint_fast64_t;
|
||||
#else
|
||||
typedef unsigned int uint_fast16_t;
|
||||
typedef unsigned int uint_fast32_t;
|
||||
typedef unsigned long long uint_fast64_t;
|
||||
#endif
|
||||
|
||||
/* Integer types capable of holding object pointers */
|
||||
|
||||
#ifndef __intptr_t_defined
|
||||
#define __intptr_t_defined
|
||||
#if __WORDSIZE == 64
|
||||
typedef long intptr_t;
|
||||
#else
|
||||
typedef int intptr_t;
|
||||
#endif
|
||||
#endif
|
||||
#if __WORDSIZE == 64
|
||||
typedef unsigned long uintptr_t;
|
||||
#else
|
||||
typedef unsigned int uintptr_t;
|
||||
#endif
|
||||
|
||||
/* Greatest-width integer types */
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
typedef long intmax_t;
|
||||
typedef unsigned long uintmax_t;
|
||||
#else
|
||||
typedef long long intmax_t;
|
||||
typedef unsigned long long uintmax_t;
|
||||
#endif
|
||||
|
||||
#ifdef __x86_64__
|
||||
# define __I64(n) n ## L
|
||||
# define __U64(n) n ## UL
|
||||
#else
|
||||
# define __I64(n) n ## LL
|
||||
# define __U64(n) n ## ULL
|
||||
#endif
|
||||
|
||||
/* Limits of exact-width integer types */
|
||||
|
||||
#define INT8_MIN (-128)
|
||||
#define INT16_MIN (-32768)
|
||||
#define INT32_MIN (-2147483647 - 1)
|
||||
#define INT64_MIN (-__I64(9223372036854775807) - 1)
|
||||
|
||||
#define INT8_MAX (127)
|
||||
#define INT16_MAX (32767)
|
||||
#define INT32_MAX (2147483647)
|
||||
#define INT64_MAX (__I64(9223372036854775807))
|
||||
|
||||
#define UINT8_MAX (255)
|
||||
#define UINT16_MAX (65535)
|
||||
#define UINT32_MAX (4294967295U)
|
||||
#define UINT64_MAX (__U64(18446744073709551615))
|
||||
|
||||
/* Limits of minimum-width integer types */
|
||||
|
||||
#define INT_LEAST8_MIN (-128)
|
||||
#define INT_LEAST16_MIN (-32768)
|
||||
#define INT_LEAST32_MIN (-2147483647 - 1)
|
||||
#define INT_LEAST64_MIN (-__I64(9223372036854775807) - 1)
|
||||
|
||||
#define INT_LEAST8_MAX (127)
|
||||
#define INT_LEAST16_MAX (32767)
|
||||
#define INT_LEAST32_MAX (2147483647)
|
||||
#define INT_LEAST64_MAX (__I64(9223372036854775807))
|
||||
|
||||
#define UINT_LEAST8_MAX (255)
|
||||
#define UINT_LEAST16_MAX (65535)
|
||||
#define UINT_LEAST32_MAX (4294967295U)
|
||||
#define UINT_LEAST64_MAX (__U64(18446744073709551615))
|
||||
|
||||
/* Limits of fastest minimum-width integer types */
|
||||
|
||||
#define INT_FAST8_MIN (-128)
|
||||
#if __WORDSIZE == 64
|
||||
#define INT_FAST16_MIN (-__I64(9223372036854775807) - 1)
|
||||
#define INT_FAST32_MIN (-__I64(9223372036854775807) - 1)
|
||||
#else
|
||||
#define INT_FAST16_MIN (-2147483647 - 1)
|
||||
#define INT_FAST32_MIN (-2147483647 - 1)
|
||||
#endif
|
||||
#define INT_FAST64_MIN (-__I64(9223372036854775807) - 1)
|
||||
|
||||
#define INT_FAST8_MAX (127)
|
||||
#if __WORDSIZE == 64
|
||||
#define INT_FAST16_MAX (__I64(9223372036854775807))
|
||||
#define INT_FAST32_MAX (__I64(9223372036854775807))
|
||||
#else
|
||||
#define INT_FAST16_MAX (2147483647)
|
||||
#define INT_FAST32_MAX (2147483647)
|
||||
#endif
|
||||
#define INT_FAST64_MAX (__I64(9223372036854775807))
|
||||
|
||||
#define UINT_FAST8_MAX (255)
|
||||
#if __WORDSIZE == 64
|
||||
#define UINT_FAST16_MAX (__U64(18446744073709551615))
|
||||
#define UINT_FAST32_MAX (__U64(18446744073709551615))
|
||||
#else
|
||||
#define UINT_FAST16_MAX (4294967295U)
|
||||
#define UINT_FAST32_MAX (4294967295U)
|
||||
#endif
|
||||
#define UINT_FAST64_MAX (__U64(18446744073709551615))
|
||||
|
||||
/* Limits of integer types capable of holding object pointers */
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
#define INTPTR_MIN (-__I64(9223372036854775807) - 1)
|
||||
#define INTPTR_MAX (__I64(9223372036854775807))
|
||||
#define UINTPTR_MAX (__U64(18446744073709551615))
|
||||
#else
|
||||
#define INTPTR_MIN (-2147483647 - 1)
|
||||
#define INTPTR_MAX (2147483647)
|
||||
#define UINTPTR_MAX (4294967295U)
|
||||
#endif
|
||||
|
||||
/* Limits of greatest-width integer types */
|
||||
|
||||
#define INTMAX_MIN (-__I64(9223372036854775807) - 1)
|
||||
#define INTMAX_MAX (__I64(9223372036854775807))
|
||||
#define UINTMAX_MAX (__U64(18446744073709551615))
|
||||
|
||||
/* Limits of other integer types */
|
||||
|
||||
#ifndef PTRDIFF_MIN
|
||||
#if __WORDSIZE == 64
|
||||
#define PTRDIFF_MIN (-9223372036854775807L - 1)
|
||||
#define PTRDIFF_MAX (9223372036854775807L)
|
||||
#else
|
||||
#define PTRDIFF_MIN (-2147483647 - 1)
|
||||
#define PTRDIFF_MAX (2147483647)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef SIG_ATOMIC_MIN
|
||||
#define SIG_ATOMIC_MIN (-2147483647 - 1)
|
||||
#endif
|
||||
#ifndef SIG_ATOMIC_MAX
|
||||
#define SIG_ATOMIC_MAX (2147483647)
|
||||
#endif
|
||||
|
||||
#ifndef SIZE_MAX
|
||||
#if __WORDSIZE == 64
|
||||
#define SIZE_MAX (18446744073709551615UL)
|
||||
#else
|
||||
#define SIZE_MAX (4294967295U)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef WCHAR_MIN
|
||||
#ifdef __WCHAR_MIN__
|
||||
#define WCHAR_MIN __WCHAR_MIN__
|
||||
#define WCHAR_MAX __WCHAR_MAX__
|
||||
#else
|
||||
#define WCHAR_MIN (0)
|
||||
#define WCHAR_MAX (65535)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef WINT_MIN
|
||||
#define WINT_MIN 0U
|
||||
#define WINT_MAX (4294967295U)
|
||||
#endif
|
||||
|
||||
/* Macros for minimum-width integer constant expressions */
|
||||
|
||||
#define INT8_C(x) x
|
||||
#define INT16_C(x) x
|
||||
#define INT32_C(x) x
|
||||
#if __WORDSIZE == 64
|
||||
#define INT64_C(x) x ## L
|
||||
#else
|
||||
#define INT64_C(x) x ## LL
|
||||
#endif
|
||||
|
||||
#define UINT8_C(x) x
|
||||
#define UINT16_C(x) x
|
||||
#define UINT32_C(x) x ## U
|
||||
#if __WORDSIZE == 64
|
||||
#define UINT64_C(x) x ## UL
|
||||
#else
|
||||
#define UINT64_C(x) x ## ULL
|
||||
#endif
|
||||
|
||||
/* Macros for greatest-width integer constant expressions */
|
||||
|
||||
#if __WORDSIZE == 64
|
||||
#define INTMAX_C(x) x ## L
|
||||
#define UINTMAX_C(x) x ## UL
|
||||
#else
|
||||
#define INTMAX_C(x) x ## LL
|
||||
#define UINTMAX_C(x) x ## ULL
|
||||
#endif
|
||||
|
||||
#endif /* _STDINT_H */
|
||||
Loading…
Reference in New Issue