Readily use `long long` as a 64-bit type in C99 mode.
* include/freetype/config/integer-types.h (FT_INT64): FT_CONFIG_OPTION_FORCE_INT64 is no longer required to use `long long`.
This commit is contained in:
parent
857038399a
commit
02ba0fc81e
|
@ -174,13 +174,17 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* determine whether we have a 64-bit `int` type for platforms without */
|
/* determine whether we have a 64-bit integer type */
|
||||||
/* Autoconf */
|
|
||||||
#if FT_SIZEOF_LONG == ( 64 / FT_CHAR_BIT )
|
#if FT_SIZEOF_LONG == ( 64 / FT_CHAR_BIT )
|
||||||
|
|
||||||
#define FT_INT64 long
|
#define FT_INT64 long
|
||||||
#define FT_UINT64 unsigned long
|
#define FT_UINT64 unsigned long
|
||||||
|
|
||||||
|
#elif defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
|
||||||
|
|
||||||
|
#define FT_INT64 long long int
|
||||||
|
#define FT_UINT64 unsigned long long int
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
*
|
*
|
||||||
* A 64-bit data type may create compilation problems if you compile in
|
* A 64-bit data type may create compilation problems if you compile in
|
||||||
|
@ -190,12 +194,7 @@
|
||||||
*/
|
*/
|
||||||
#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
|
#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
|
||||||
|
|
||||||
#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
|
#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
|
||||||
|
|
||||||
#define FT_INT64 long long int
|
|
||||||
#define FT_UINT64 unsigned long long int
|
|
||||||
|
|
||||||
#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
|
|
||||||
|
|
||||||
/* this compiler provides the `__int64` type */
|
/* this compiler provides the `__int64` type */
|
||||||
#define FT_INT64 __int64
|
#define FT_INT64 __int64
|
||||||
|
@ -225,7 +224,7 @@
|
||||||
#define FT_INT64 long long int
|
#define FT_INT64 long long int
|
||||||
#define FT_UINT64 unsigned long long int
|
#define FT_UINT64 unsigned long long int
|
||||||
|
|
||||||
#endif /* __STDC_VERSION__ >= 199901L */
|
#endif /* !__STDC__ */
|
||||||
|
|
||||||
#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
|
#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue