mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
15081be993
As noted in bug 17979 (and as I noted earlier in <https://sourceware.org/ml/libc-alpha/2012-02/msg00647.html>), uchar.h has gratuitously complicated code to determine the types for char16_t and char32_t, and to reject including that header for pre-C11 compilers not defining __CHAR16_TYPE__ and __CHAR32_TYPE__. Since those types are always required to match uint_least16_t and uint_least32_t, which glibc knows how to define without reference to such predefined macros, it's safe just to define those types the same as the *least* types are defined in stdint.h, so allowing the header to work with (for example) GCC 4.3. This patch implements that. bits/types.h is made to define __int_leastN_t and __uint_leastN_t so the logic for those types can stay in a single place, and stdint.h is made to use those __*_t to define the public *_t types. uchar.h is then made to use __uint_least16_t and __uint_least32_t to define char16_t and char32_t, so simplifying the logic there. A new test is added that verifies the types chosen for char16_t and char32_t do indeed match the types the compiler uses for u"" and U"" string literals. Tested for x86_64. (I have not tested with any of the older compilers for which this would actually make a difference to whether you can include uchar.h.) [BZ #17979] * posix/bits/types.h (__int_least8_t): New typedef. (__uint_least8_t): Likewise. (__int_least16_t): Likewise. (__uint_least16_t): Likewise. (__int_least32_t): Likewise. (__uint_least32_t): Likewise. (__int_least64_t): Likewise. (__uint_least64_t): Likewise. * sysdeps/generic/stdint.h (int_least8_t): Define using __int_least8_t. (int_least16_t): Define using __int_least16_t. (int_least32_t): Define using __int_least32_t. (int_least64_t): Define using __int_least64_t. (uint_least8_t): Define using __uint_least8_t. (uint_least16_t): Define using __uint_least16_t. (uint_least32_t): Define using __uint_least32_t. (uint_least64_t): Define using __uint_least64_t. * wcsmbs/uchar.h: Include <bits/types.h>. (char16_t): Define using __uint_least16_t conditional only on [!__USE_ISOCXX11]. (char32_t): Define using __uint_least32_t conditional only on [!__USE_ISOCXX11]. * wcsmbs/test-char-types.c: New file. * wcsmbs/Makefile (tests): Add test-char-types.
320 lines
8.3 KiB
C
320 lines
8.3 KiB
C
/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/*
|
|
* ISO C99: 7.18 Integer types <stdint.h>
|
|
*/
|
|
|
|
#ifndef _STDINT_H
|
|
#define _STDINT_H 1
|
|
|
|
#define __GLIBC_INTERNAL_STARTING_HEADER_IMPLEMENTATION
|
|
#include <bits/libc-header-start.h>
|
|
#include <bits/types.h>
|
|
#include <bits/wchar.h>
|
|
#include <bits/wordsize.h>
|
|
|
|
/* Exact integral types. */
|
|
|
|
/* Signed. */
|
|
#include <bits/stdint-intn.h>
|
|
|
|
/* Unsigned. */
|
|
#include <bits/stdint-uintn.h>
|
|
|
|
|
|
/* Small types. */
|
|
|
|
/* Signed. */
|
|
typedef __int_least8_t int_least8_t;
|
|
typedef __int_least16_t int_least16_t;
|
|
typedef __int_least32_t int_least32_t;
|
|
typedef __int_least64_t int_least64_t;
|
|
|
|
/* Unsigned. */
|
|
typedef __uint_least8_t uint_least8_t;
|
|
typedef __uint_least16_t uint_least16_t;
|
|
typedef __uint_least32_t uint_least32_t;
|
|
typedef __uint_least64_t uint_least64_t;
|
|
|
|
|
|
/* Fast types. */
|
|
|
|
/* Signed. */
|
|
typedef signed char int_fast8_t;
|
|
#if __WORDSIZE == 64
|
|
typedef long int int_fast16_t;
|
|
typedef long int int_fast32_t;
|
|
typedef long int int_fast64_t;
|
|
#else
|
|
typedef int int_fast16_t;
|
|
typedef int int_fast32_t;
|
|
__extension__
|
|
typedef long long int int_fast64_t;
|
|
#endif
|
|
|
|
/* Unsigned. */
|
|
typedef unsigned char uint_fast8_t;
|
|
#if __WORDSIZE == 64
|
|
typedef unsigned long int uint_fast16_t;
|
|
typedef unsigned long int uint_fast32_t;
|
|
typedef unsigned long int uint_fast64_t;
|
|
#else
|
|
typedef unsigned int uint_fast16_t;
|
|
typedef unsigned int uint_fast32_t;
|
|
__extension__
|
|
typedef unsigned long long int uint_fast64_t;
|
|
#endif
|
|
|
|
|
|
/* Types for `void *' pointers. */
|
|
#if __WORDSIZE == 64
|
|
# ifndef __intptr_t_defined
|
|
typedef long int intptr_t;
|
|
# define __intptr_t_defined
|
|
# endif
|
|
typedef unsigned long int uintptr_t;
|
|
#else
|
|
# ifndef __intptr_t_defined
|
|
typedef int intptr_t;
|
|
# define __intptr_t_defined
|
|
# endif
|
|
typedef unsigned int uintptr_t;
|
|
#endif
|
|
|
|
|
|
/* Largest integral types. */
|
|
typedef __intmax_t intmax_t;
|
|
typedef __uintmax_t uintmax_t;
|
|
|
|
|
|
# if __WORDSIZE == 64
|
|
# define __INT64_C(c) c ## L
|
|
# define __UINT64_C(c) c ## UL
|
|
# else
|
|
# define __INT64_C(c) c ## LL
|
|
# define __UINT64_C(c) c ## ULL
|
|
# endif
|
|
|
|
/* Limits of integral types. */
|
|
|
|
/* Minimum of signed integral types. */
|
|
# define INT8_MIN (-128)
|
|
# define INT16_MIN (-32767-1)
|
|
# define INT32_MIN (-2147483647-1)
|
|
# define INT64_MIN (-__INT64_C(9223372036854775807)-1)
|
|
/* Maximum of signed integral types. */
|
|
# define INT8_MAX (127)
|
|
# define INT16_MAX (32767)
|
|
# define INT32_MAX (2147483647)
|
|
# define INT64_MAX (__INT64_C(9223372036854775807))
|
|
|
|
/* Maximum of unsigned integral types. */
|
|
# define UINT8_MAX (255)
|
|
# define UINT16_MAX (65535)
|
|
# define UINT32_MAX (4294967295U)
|
|
# define UINT64_MAX (__UINT64_C(18446744073709551615))
|
|
|
|
|
|
/* Minimum of signed integral types having a minimum size. */
|
|
# define INT_LEAST8_MIN (-128)
|
|
# define INT_LEAST16_MIN (-32767-1)
|
|
# define INT_LEAST32_MIN (-2147483647-1)
|
|
# define INT_LEAST64_MIN (-__INT64_C(9223372036854775807)-1)
|
|
/* Maximum of signed integral types having a minimum size. */
|
|
# define INT_LEAST8_MAX (127)
|
|
# define INT_LEAST16_MAX (32767)
|
|
# define INT_LEAST32_MAX (2147483647)
|
|
# define INT_LEAST64_MAX (__INT64_C(9223372036854775807))
|
|
|
|
/* Maximum of unsigned integral types having a minimum size. */
|
|
# define UINT_LEAST8_MAX (255)
|
|
# define UINT_LEAST16_MAX (65535)
|
|
# define UINT_LEAST32_MAX (4294967295U)
|
|
# define UINT_LEAST64_MAX (__UINT64_C(18446744073709551615))
|
|
|
|
|
|
/* Minimum of fast signed integral types having a minimum size. */
|
|
# define INT_FAST8_MIN (-128)
|
|
# if __WORDSIZE == 64
|
|
# define INT_FAST16_MIN (-9223372036854775807L-1)
|
|
# define INT_FAST32_MIN (-9223372036854775807L-1)
|
|
# else
|
|
# define INT_FAST16_MIN (-2147483647-1)
|
|
# define INT_FAST32_MIN (-2147483647-1)
|
|
# endif
|
|
# define INT_FAST64_MIN (-__INT64_C(9223372036854775807)-1)
|
|
/* Maximum of fast signed integral types having a minimum size. */
|
|
# define INT_FAST8_MAX (127)
|
|
# if __WORDSIZE == 64
|
|
# define INT_FAST16_MAX (9223372036854775807L)
|
|
# define INT_FAST32_MAX (9223372036854775807L)
|
|
# else
|
|
# define INT_FAST16_MAX (2147483647)
|
|
# define INT_FAST32_MAX (2147483647)
|
|
# endif
|
|
# define INT_FAST64_MAX (__INT64_C(9223372036854775807))
|
|
|
|
/* Maximum of fast unsigned integral types having a minimum size. */
|
|
# define UINT_FAST8_MAX (255)
|
|
# if __WORDSIZE == 64
|
|
# define UINT_FAST16_MAX (18446744073709551615UL)
|
|
# define UINT_FAST32_MAX (18446744073709551615UL)
|
|
# else
|
|
# define UINT_FAST16_MAX (4294967295U)
|
|
# define UINT_FAST32_MAX (4294967295U)
|
|
# endif
|
|
# define UINT_FAST64_MAX (__UINT64_C(18446744073709551615))
|
|
|
|
|
|
/* Values to test for integral types holding `void *' pointer. */
|
|
# if __WORDSIZE == 64
|
|
# define INTPTR_MIN (-9223372036854775807L-1)
|
|
# define INTPTR_MAX (9223372036854775807L)
|
|
# define UINTPTR_MAX (18446744073709551615UL)
|
|
# else
|
|
# define INTPTR_MIN (-2147483647-1)
|
|
# define INTPTR_MAX (2147483647)
|
|
# define UINTPTR_MAX (4294967295U)
|
|
# endif
|
|
|
|
|
|
/* Minimum for largest signed integral type. */
|
|
# define INTMAX_MIN (-__INT64_C(9223372036854775807)-1)
|
|
/* Maximum for largest signed integral type. */
|
|
# define INTMAX_MAX (__INT64_C(9223372036854775807))
|
|
|
|
/* Maximum for largest unsigned integral type. */
|
|
# define UINTMAX_MAX (__UINT64_C(18446744073709551615))
|
|
|
|
|
|
/* Limits of other integer types. */
|
|
|
|
/* Limits of `ptrdiff_t' type. */
|
|
# if __WORDSIZE == 64
|
|
# define PTRDIFF_MIN (-9223372036854775807L-1)
|
|
# define PTRDIFF_MAX (9223372036854775807L)
|
|
# else
|
|
# if __WORDSIZE32_PTRDIFF_LONG
|
|
# define PTRDIFF_MIN (-2147483647L-1)
|
|
# define PTRDIFF_MAX (2147483647L)
|
|
# else
|
|
# define PTRDIFF_MIN (-2147483647-1)
|
|
# define PTRDIFF_MAX (2147483647)
|
|
# endif
|
|
# endif
|
|
|
|
/* Limits of `sig_atomic_t'. */
|
|
# define SIG_ATOMIC_MIN (-2147483647-1)
|
|
# define SIG_ATOMIC_MAX (2147483647)
|
|
|
|
/* Limit of `size_t' type. */
|
|
# if __WORDSIZE == 64
|
|
# define SIZE_MAX (18446744073709551615UL)
|
|
# else
|
|
# if __WORDSIZE32_SIZE_ULONG
|
|
# define SIZE_MAX (4294967295UL)
|
|
# else
|
|
# define SIZE_MAX (4294967295U)
|
|
# endif
|
|
# endif
|
|
|
|
/* Limits of `wchar_t'. */
|
|
# ifndef WCHAR_MIN
|
|
/* These constants might also be defined in <wchar.h>. */
|
|
# define WCHAR_MIN __WCHAR_MIN
|
|
# define WCHAR_MAX __WCHAR_MAX
|
|
# endif
|
|
|
|
/* Limits of `wint_t'. */
|
|
# define WINT_MIN (0u)
|
|
# define WINT_MAX (4294967295u)
|
|
|
|
/* Signed. */
|
|
# define INT8_C(c) c
|
|
# define INT16_C(c) c
|
|
# define INT32_C(c) c
|
|
# if __WORDSIZE == 64
|
|
# define INT64_C(c) c ## L
|
|
# else
|
|
# define INT64_C(c) c ## LL
|
|
# endif
|
|
|
|
/* Unsigned. */
|
|
# define UINT8_C(c) c
|
|
# define UINT16_C(c) c
|
|
# define UINT32_C(c) c ## U
|
|
# if __WORDSIZE == 64
|
|
# define UINT64_C(c) c ## UL
|
|
# else
|
|
# define UINT64_C(c) c ## ULL
|
|
# endif
|
|
|
|
/* Maximal type. */
|
|
# if __WORDSIZE == 64
|
|
# define INTMAX_C(c) c ## L
|
|
# define UINTMAX_C(c) c ## UL
|
|
# else
|
|
# define INTMAX_C(c) c ## LL
|
|
# define UINTMAX_C(c) c ## ULL
|
|
# endif
|
|
|
|
#if __GLIBC_USE (IEC_60559_BFP_EXT)
|
|
|
|
# define INT8_WIDTH 8
|
|
# define UINT8_WIDTH 8
|
|
# define INT16_WIDTH 16
|
|
# define UINT16_WIDTH 16
|
|
# define INT32_WIDTH 32
|
|
# define UINT32_WIDTH 32
|
|
# define INT64_WIDTH 64
|
|
# define UINT64_WIDTH 64
|
|
|
|
# define INT_LEAST8_WIDTH 8
|
|
# define UINT_LEAST8_WIDTH 8
|
|
# define INT_LEAST16_WIDTH 16
|
|
# define UINT_LEAST16_WIDTH 16
|
|
# define INT_LEAST32_WIDTH 32
|
|
# define UINT_LEAST32_WIDTH 32
|
|
# define INT_LEAST64_WIDTH 64
|
|
# define UINT_LEAST64_WIDTH 64
|
|
|
|
# define INT_FAST8_WIDTH 8
|
|
# define UINT_FAST8_WIDTH 8
|
|
# define INT_FAST16_WIDTH __WORDSIZE
|
|
# define UINT_FAST16_WIDTH __WORDSIZE
|
|
# define INT_FAST32_WIDTH __WORDSIZE
|
|
# define UINT_FAST32_WIDTH __WORDSIZE
|
|
# define INT_FAST64_WIDTH 64
|
|
# define UINT_FAST64_WIDTH 64
|
|
|
|
# define INTPTR_WIDTH __WORDSIZE
|
|
# define UINTPTR_WIDTH __WORDSIZE
|
|
|
|
# define INTMAX_WIDTH 64
|
|
# define UINTMAX_WIDTH 64
|
|
|
|
# define PTRDIFF_WIDTH __WORDSIZE
|
|
# define SIG_ATOMIC_WIDTH 32
|
|
# define SIZE_WIDTH __WORDSIZE
|
|
# define WCHAR_WIDTH 32
|
|
# define WINT_WIDTH 32
|
|
|
|
#endif
|
|
|
|
#endif /* stdint.h */
|