Forgotten header update for windows compilation.
This commit is contained in:
@@ -1,63 +1,89 @@
|
|||||||
|
/**
|
||||||
|
* This file has no copyright assigned and is placed in the Public Domain.
|
||||||
|
* This file was originally part of the w64 mingw-runtime package.
|
||||||
|
*/
|
||||||
/* ISO C9x 7.18 Integer types <stdint.h>
|
/* ISO C9x 7.18 Integer types <stdint.h>
|
||||||
* Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
|
* Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS NOT COPYRIGHTED
|
* THIS SOFTWARE IS NOT COPYRIGHTED
|
||||||
*
|
*
|
||||||
* Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
|
* Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
|
||||||
*
|
* Modified for libusb/MSVC: Pete Batard <pbatard@gmail.com>
|
||||||
* This source code is offered for use in the public domain. You may
|
*
|
||||||
* use, modify or distribute it freely.
|
* This source code is offered for use in the public domain. You may
|
||||||
*
|
* use, modify or distribute it freely.
|
||||||
* This code is distributed in the hope that it will be useful but
|
*
|
||||||
* WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
|
* This code is distributed in the hope that it will be useful but
|
||||||
* DISCLAIMED. This includes but is not limited to warranties of
|
* WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
* DISCLAIMED. This includes but is not limited to warranties of
|
||||||
*
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
* Date: 2000-12-02
|
*
|
||||||
*
|
* Date: 2010-04-02
|
||||||
* mwb: This was modified in the following ways:
|
*/
|
||||||
*
|
#ifndef _MSC_VER
|
||||||
* - make it compatible with Visual C++ 6 (which uses
|
#error This header should only be used with Microsoft compilers
|
||||||
* non-standard keywords and suffixes for 64-bit types)
|
#endif
|
||||||
* - some environments need stddef.h included (for wchar stuff?)
|
|
||||||
* - handle the fact that Microsoft's limits.h header defines
|
|
||||||
* SIZE_MAX
|
|
||||||
* - make corrections for SIZE_MAX, INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX,
|
|
||||||
* PTRDIFF_MIN, PTRDIFF_MAX, SIG_ATOMIC_MIN, and SIG_ATOMIC_MAX
|
|
||||||
* to be 64-bit aware.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _STDINT_H
|
#ifndef _STDINT_H
|
||||||
#define _STDINT_H
|
#define _STDINT_H
|
||||||
#define __need_wint_t
|
#ifndef _INTPTR_T_DEFINED
|
||||||
#define __need_wchar_t
|
#define _INTPTR_T_DEFINED
|
||||||
#include <wchar.h>
|
#ifndef __intptr_t_defined
|
||||||
#include <stddef.h>
|
#define __intptr_t_defined
|
||||||
|
#undef intptr_t
|
||||||
#if _MSC_VER && (_MSC_VER < 1300)
|
#ifdef _WIN64
|
||||||
/* using MSVC 6 or earlier - no "long long" type, but might have _int64 type */
|
typedef __int64 intptr_t;
|
||||||
#define __STDINT_LONGLONG __int64
|
|
||||||
#define __STDINT_LONGLONG_SUFFIX i64
|
|
||||||
#else
|
#else
|
||||||
#define __STDINT_LONGLONG long long
|
typedef int intptr_t;
|
||||||
#define __STDINT_LONGLONG_SUFFIX LL
|
#endif /* _WIN64 */
|
||||||
#endif
|
#endif /* __intptr_t_defined */
|
||||||
|
#endif /* _INTPTR_T_DEFINED */
|
||||||
#if !defined( PASTE)
|
#ifndef _UINTPTR_T_DEFINED
|
||||||
#define PASTE2( x, y) x##y
|
#define _UINTPTR_T_DEFINED
|
||||||
#define PASTE( x, y) PASTE2( x, y)
|
#ifndef __uintptr_t_defined
|
||||||
#endif /* PASTE */
|
#define __uintptr_t_defined
|
||||||
|
#undef uintptr_t
|
||||||
|
#ifdef _WIN64
|
||||||
|
typedef unsigned __int64 uintptr_t;
|
||||||
|
#else
|
||||||
|
typedef unsigned int uintptr_t;
|
||||||
|
#endif /* _WIN64 */
|
||||||
|
#endif /* __uintptr_t_defined */
|
||||||
|
#endif /* _UINTPTR_T_DEFINED */
|
||||||
|
#ifndef _PTRDIFF_T_DEFINED
|
||||||
|
#define _PTRDIFF_T_DEFINED
|
||||||
|
#ifndef _PTRDIFF_T_
|
||||||
|
#define _PTRDIFF_T_
|
||||||
|
#undef ptrdiff_t
|
||||||
|
#ifdef _WIN64
|
||||||
|
typedef __int64 ptrdiff_t;
|
||||||
|
#else
|
||||||
|
typedef int ptrdiff_t;
|
||||||
|
#endif /* _WIN64 */
|
||||||
|
#endif /* _PTRDIFF_T_ */
|
||||||
|
#endif /* _PTRDIFF_T_DEFINED */
|
||||||
|
#ifndef _WCHAR_T_DEFINED
|
||||||
|
#define _WCHAR_T_DEFINED
|
||||||
|
#ifndef __cplusplus
|
||||||
|
typedef unsigned short wchar_t;
|
||||||
|
#endif /* C++ */
|
||||||
|
#endif /* _WCHAR_T_DEFINED */
|
||||||
|
#ifndef _WCTYPE_T_DEFINED
|
||||||
|
#define _WCTYPE_T_DEFINED
|
||||||
|
#ifndef _WINT_T
|
||||||
|
#define _WINT_T
|
||||||
|
typedef unsigned short wint_t;
|
||||||
|
typedef unsigned short wctype_t;
|
||||||
|
#endif /* _WINT_T */
|
||||||
|
#endif /* _WCTYPE_T_DEFINED */
|
||||||
/* 7.18.1.1 Exact-width integer types */
|
/* 7.18.1.1 Exact-width integer types */
|
||||||
typedef signed char int8_t;
|
typedef __int8 int8_t;
|
||||||
typedef unsigned char uint8_t;
|
typedef unsigned __int8 uint8_t;
|
||||||
typedef short int16_t;
|
typedef __int16 int16_t;
|
||||||
typedef unsigned short uint16_t;
|
typedef unsigned __int16 uint16_t;
|
||||||
typedef int int32_t;
|
typedef __int32 int32_t;
|
||||||
typedef unsigned uint32_t;
|
typedef unsigned __int32 uint32_t;
|
||||||
typedef __STDINT_LONGLONG int64_t;
|
typedef __int64 int64_t;
|
||||||
typedef unsigned __STDINT_LONGLONG uint64_t;
|
typedef unsigned __int64 uint64_t;
|
||||||
|
|
||||||
/* 7.18.1.2 Minimum-width integer types */
|
/* 7.18.1.2 Minimum-width integer types */
|
||||||
typedef signed char int_least8_t;
|
typedef signed char int_least8_t;
|
||||||
typedef unsigned char uint_least8_t;
|
typedef unsigned char uint_least8_t;
|
||||||
@@ -65,97 +91,65 @@ typedef short int_least16_t;
|
|||||||
typedef unsigned short uint_least16_t;
|
typedef unsigned short uint_least16_t;
|
||||||
typedef int int_least32_t;
|
typedef int int_least32_t;
|
||||||
typedef unsigned uint_least32_t;
|
typedef unsigned uint_least32_t;
|
||||||
typedef __STDINT_LONGLONG int_least64_t;
|
typedef __int64 int_least64_t;
|
||||||
typedef unsigned __STDINT_LONGLONG uint_least64_t;
|
typedef unsigned __int64 uint_least64_t;
|
||||||
|
/* 7.18.1.3 Fastest minimum-width integer types
|
||||||
/* 7.18.1.3 Fastest minimum-width integer types
|
* Not actually guaranteed to be fastest for all purposes
|
||||||
* Not actually guaranteed to be fastest for all purposes
|
* Here we use the exact-width types for 8 and 16-bit ints.
|
||||||
* Here we use the exact-width types for 8 and 16-bit ints.
|
*/
|
||||||
*/
|
typedef __int8 int_fast8_t;
|
||||||
typedef char int_fast8_t;
|
typedef unsigned __int8 uint_fast8_t;
|
||||||
typedef unsigned char uint_fast8_t;
|
typedef __int16 int_fast16_t;
|
||||||
typedef short int_fast16_t;
|
typedef unsigned __int16 uint_fast16_t;
|
||||||
typedef unsigned short uint_fast16_t;
|
typedef __int32 int_fast32_t;
|
||||||
typedef int int_fast32_t;
|
typedef unsigned __int32 uint_fast32_t;
|
||||||
typedef unsigned int uint_fast32_t;
|
typedef __int64 int_fast64_t;
|
||||||
typedef __STDINT_LONGLONG int_fast64_t;
|
typedef unsigned __int64 uint_fast64_t;
|
||||||
typedef unsigned __STDINT_LONGLONG uint_fast64_t;
|
|
||||||
|
|
||||||
/* 7.18.1.4 Integer types capable of holding object pointers */
|
|
||||||
#ifndef _INTPTR_T_DEFINED
|
|
||||||
#define _INTPTR_T_DEFINED
|
|
||||||
#ifdef _WIN64
|
|
||||||
typedef __STDINT_LONGLONG intptr_t
|
|
||||||
#else
|
|
||||||
typedef int intptr_t;
|
|
||||||
#endif /* _WIN64 */
|
|
||||||
#endif /* _INTPTR_T_DEFINED */
|
|
||||||
|
|
||||||
#ifndef _UINTPTR_T_DEFINED
|
|
||||||
#define _UINTPTR_T_DEFINED
|
|
||||||
#ifdef _WIN64
|
|
||||||
typedef unsigned __STDINT_LONGLONG uintptr_t
|
|
||||||
#else
|
|
||||||
typedef unsigned int uintptr_t;
|
|
||||||
#endif /* _WIN64 */
|
|
||||||
#endif /* _UINTPTR_T_DEFINED */
|
|
||||||
|
|
||||||
/* 7.18.1.5 Greatest-width integer types */
|
/* 7.18.1.5 Greatest-width integer types */
|
||||||
typedef __STDINT_LONGLONG intmax_t;
|
typedef __int64 intmax_t;
|
||||||
typedef unsigned __STDINT_LONGLONG uintmax_t;
|
typedef unsigned __int64 uintmax_t;
|
||||||
|
|
||||||
/* 7.18.2 Limits of specified-width integer types */
|
/* 7.18.2 Limits of specified-width integer types */
|
||||||
#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS)
|
|
||||||
|
|
||||||
/* 7.18.2.1 Limits of exact-width integer types */
|
/* 7.18.2.1 Limits of exact-width integer types */
|
||||||
#define INT8_MIN (-128)
|
#define INT8_MIN (-128)
|
||||||
#define INT16_MIN (-32768)
|
#define INT16_MIN (-32768)
|
||||||
#define INT32_MIN (-2147483647 - 1)
|
#define INT32_MIN (-2147483647 - 1)
|
||||||
#define INT64_MIN (PASTE( -9223372036854775807, __STDINT_LONGLONG_SUFFIX) - 1)
|
#define INT64_MIN (-9223372036854775807LL - 1)
|
||||||
|
|
||||||
#define INT8_MAX 127
|
#define INT8_MAX 127
|
||||||
#define INT16_MAX 32767
|
#define INT16_MAX 32767
|
||||||
#define INT32_MAX 2147483647
|
#define INT32_MAX 2147483647
|
||||||
#define INT64_MAX (PASTE( 9223372036854775807, __STDINT_LONGLONG_SUFFIX))
|
#define INT64_MAX 9223372036854775807LL
|
||||||
|
#define UINT8_MAX 255
|
||||||
#define UINT8_MAX 0xff /* 255U */
|
#define UINT16_MAX 65535
|
||||||
#define UINT16_MAX 0xffff /* 65535U */
|
#define UINT32_MAX 0xffffffffU /* 4294967295U */
|
||||||
#define UINT32_MAX 0xffffffff /* 4294967295U */
|
#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
|
||||||
#define UINT64_MAX (PASTE( 0xffffffffffffffffU, __STDINT_LONGLONG_SUFFIX)) /* 18446744073709551615ULL */
|
|
||||||
|
|
||||||
/* 7.18.2.2 Limits of minimum-width integer types */
|
/* 7.18.2.2 Limits of minimum-width integer types */
|
||||||
#define INT_LEAST8_MIN INT8_MIN
|
#define INT_LEAST8_MIN INT8_MIN
|
||||||
#define INT_LEAST16_MIN INT16_MIN
|
#define INT_LEAST16_MIN INT16_MIN
|
||||||
#define INT_LEAST32_MIN INT32_MIN
|
#define INT_LEAST32_MIN INT32_MIN
|
||||||
#define INT_LEAST64_MIN INT64_MIN
|
#define INT_LEAST64_MIN INT64_MIN
|
||||||
|
|
||||||
#define INT_LEAST8_MAX INT8_MAX
|
#define INT_LEAST8_MAX INT8_MAX
|
||||||
#define INT_LEAST16_MAX INT16_MAX
|
#define INT_LEAST16_MAX INT16_MAX
|
||||||
#define INT_LEAST32_MAX INT32_MAX
|
#define INT_LEAST32_MAX INT32_MAX
|
||||||
#define INT_LEAST64_MAX INT64_MAX
|
#define INT_LEAST64_MAX INT64_MAX
|
||||||
|
|
||||||
#define UINT_LEAST8_MAX UINT8_MAX
|
#define UINT_LEAST8_MAX UINT8_MAX
|
||||||
#define UINT_LEAST16_MAX UINT16_MAX
|
#define UINT_LEAST16_MAX UINT16_MAX
|
||||||
#define UINT_LEAST32_MAX UINT32_MAX
|
#define UINT_LEAST32_MAX UINT32_MAX
|
||||||
#define UINT_LEAST64_MAX UINT64_MAX
|
#define UINT_LEAST64_MAX UINT64_MAX
|
||||||
|
|
||||||
/* 7.18.2.3 Limits of fastest minimum-width integer types */
|
/* 7.18.2.3 Limits of fastest minimum-width integer types */
|
||||||
#define INT_FAST8_MIN INT8_MIN
|
#define INT_FAST8_MIN INT8_MIN
|
||||||
#define INT_FAST16_MIN INT16_MIN
|
#define INT_FAST16_MIN INT16_MIN
|
||||||
#define INT_FAST32_MIN INT32_MIN
|
#define INT_FAST32_MIN INT32_MIN
|
||||||
#define INT_FAST64_MIN INT64_MIN
|
#define INT_FAST64_MIN INT64_MIN
|
||||||
|
|
||||||
#define INT_FAST8_MAX INT8_MAX
|
#define INT_FAST8_MAX INT8_MAX
|
||||||
#define INT_FAST16_MAX INT16_MAX
|
#define INT_FAST16_MAX INT16_MAX
|
||||||
#define INT_FAST32_MAX INT32_MAX
|
#define INT_FAST32_MAX INT32_MAX
|
||||||
#define INT_FAST64_MAX INT64_MAX
|
#define INT_FAST64_MAX INT64_MAX
|
||||||
|
|
||||||
#define UINT_FAST8_MAX UINT8_MAX
|
#define UINT_FAST8_MAX UINT8_MAX
|
||||||
#define UINT_FAST16_MAX UINT16_MAX
|
#define UINT_FAST16_MAX UINT16_MAX
|
||||||
#define UINT_FAST32_MAX UINT32_MAX
|
#define UINT_FAST32_MAX UINT32_MAX
|
||||||
#define UINT_FAST64_MAX UINT64_MAX
|
#define UINT_FAST64_MAX UINT64_MAX
|
||||||
|
/* 7.18.2.4 Limits of integer types capable of holding
|
||||||
/* 7.18.2.4 Limits of integer types capable of holding object pointers */
|
object pointers */
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
#define INTPTR_MIN INT64_MIN
|
#define INTPTR_MIN INT64_MIN
|
||||||
#define INTPTR_MAX INT64_MAX
|
#define INTPTR_MAX INT64_MAX
|
||||||
@@ -164,42 +158,40 @@ typedef unsigned __STDINT_LONGLONG uintmax_t;
|
|||||||
#define INTPTR_MIN INT32_MIN
|
#define INTPTR_MIN INT32_MIN
|
||||||
#define INTPTR_MAX INT32_MAX
|
#define INTPTR_MAX INT32_MAX
|
||||||
#define UINTPTR_MAX UINT32_MAX
|
#define UINTPTR_MAX UINT32_MAX
|
||||||
#endif /* _WIN64 */
|
#endif
|
||||||
|
|
||||||
/* 7.18.2.5 Limits of greatest-width integer types */
|
/* 7.18.2.5 Limits of greatest-width integer types */
|
||||||
#define INTMAX_MIN INT64_MIN
|
#define INTMAX_MIN INT64_MIN
|
||||||
#define INTMAX_MAX INT64_MAX
|
#define INTMAX_MAX INT64_MAX
|
||||||
#define UINTMAX_MAX UINT64_MAX
|
#define UINTMAX_MAX UINT64_MAX
|
||||||
|
|
||||||
/* 7.18.3 Limits of other integer types */
|
/* 7.18.3 Limits of other integer types */
|
||||||
#define PTRDIFF_MIN INTPTR_MIN
|
#ifdef _WIN64
|
||||||
#define PTRDIFF_MAX INTPTR_MAX
|
#define PTRDIFF_MIN INT64_MIN
|
||||||
|
#define PTRDIFF_MAX INT64_MAX
|
||||||
#define SIG_ATOMIC_MIN INTPTR_MIN
|
#else
|
||||||
#define SIG_ATOMIC_MAX INTPTR_MAX
|
#define PTRDIFF_MIN INT32_MIN
|
||||||
|
#define PTRDIFF_MAX INT32_MAX
|
||||||
/* we need to check for SIZE_MAX already defined because MS defines it in limits.h */
|
#endif
|
||||||
|
#define SIG_ATOMIC_MIN INT32_MIN
|
||||||
|
#define SIG_ATOMIC_MAX INT32_MAX
|
||||||
#ifndef SIZE_MAX
|
#ifndef SIZE_MAX
|
||||||
#define SIZE_MAX UINTPTR_MAX
|
#ifdef _WIN64
|
||||||
|
#define SIZE_MAX UINT64_MAX
|
||||||
|
#else
|
||||||
|
#define SIZE_MAX UINT32_MAX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WCHAR_MIN /* also in wchar.h */
|
|
||||||
#define WCHAR_MIN 0
|
|
||||||
#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */
|
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef WCHAR_MIN /* also in wchar.h */
|
||||||
/* wint_t is unsigned short for compatibility with MS runtime */
|
#define WCHAR_MIN 0U
|
||||||
#define WINT_MIN 0
|
#define WCHAR_MAX 0xffffU
|
||||||
#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */
|
#endif
|
||||||
|
/*
|
||||||
#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */
|
* wint_t is unsigned short for compatibility with MS runtime
|
||||||
|
*/
|
||||||
|
#define WINT_MIN 0U
|
||||||
|
#define WINT_MAX 0xffffU
|
||||||
/* 7.18.4 Macros for integer constants */
|
/* 7.18.4 Macros for integer constants */
|
||||||
#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS)
|
|
||||||
|
|
||||||
/* 7.18.4.1 Macros for minimum-width integer constants
|
/* 7.18.4.1 Macros for minimum-width integer constants
|
||||||
|
Accoding to Douglas Gwyn <gwyn@arl.mil>:
|
||||||
Accoding to Douglas Gwyn <gwyn@arl.mil>:
|
|
||||||
"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC
|
"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC
|
||||||
9899:1999 as initially published, the expansion was required
|
9899:1999 as initially published, the expansion was required
|
||||||
to be an integer constant of precisely matching type, which
|
to be an integer constant of precisely matching type, which
|
||||||
@@ -208,22 +200,19 @@ typedef unsigned __STDINT_LONGLONG uintmax_t;
|
|||||||
an integer constant with width less than that of type int.
|
an integer constant with width less than that of type int.
|
||||||
TC1 changed this to require just an integer constant
|
TC1 changed this to require just an integer constant
|
||||||
*expression* with *promoted* type."
|
*expression* with *promoted* type."
|
||||||
|
The trick used here is from Clive D W Feather.
|
||||||
*/
|
*/
|
||||||
|
#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val))
|
||||||
#define INT8_C(val) ((int8_t) + (val))
|
#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val))
|
||||||
#define UINT8_C(val) ((uint8_t) + (val##U))
|
#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val))
|
||||||
#define INT16_C(val) ((int16_t) + (val))
|
/* The 'trick' doesn't work in C89 for long long because, without
|
||||||
#define UINT16_C(val) ((uint16_t) + (val##U))
|
suffix, (val) will be evaluated as int, not intmax_t */
|
||||||
|
#define INT64_C(val) val##i64
|
||||||
#define INT32_C(val) val##L
|
#define UINT8_C(val) (val)
|
||||||
#define UINT32_C(val) val##UL
|
#define UINT16_C(val) (val)
|
||||||
#define INT64_C(val) (PASTE( val, __STDINT_LONGLONG_SUFFIX))
|
#define UINT32_C(val) (val##i32)
|
||||||
#define UINT64_C(val)(PASTE( PASTE( val, U), __STDINT_LONGLONG_SUFFIX))
|
#define UINT64_C(val) val##ui64
|
||||||
|
|
||||||
/* 7.18.4.2 Macros for greatest-width integer constants */
|
/* 7.18.4.2 Macros for greatest-width integer constants */
|
||||||
#define INTMAX_C(val) INT64_C(val)
|
#define INTMAX_C(val) val##i64
|
||||||
#define UINTMAX_C(val) UINT64_C(val)
|
#define UINTMAX_C(val) val##ui64
|
||||||
|
#endif
|
||||||
#endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Reference in New Issue
Block a user