diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-08-18 23:27:48 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-08-18 23:27:48 -0400 |
| commit | 02ba0fc81e57a3934c6c1842ade6def0facf82d8 (patch) | |
| tree | 820bf9e97d82261647ff847a121e37b4a47474a8 | |
| parent | 857038399a28b9379317b46317bb85634f969c9d (diff) | |
| download | freetype2-02ba0fc81e57a3934c6c1842ade6def0facf82d8.tar.gz | |
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`.
| -rw-r--r-- | include/freetype/config/integer-types.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/freetype/config/integer-types.h b/include/freetype/config/integer-types.h index 0f3f3ee2b..684aa5377 100644 --- a/include/freetype/config/integer-types.h +++ b/include/freetype/config/integer-types.h @@ -174,13 +174,17 @@ #endif - /* determine whether we have a 64-bit `int` type for platforms without */ - /* Autoconf */ + /* determine whether we have a 64-bit integer type */ #if FT_SIZEOF_LONG == ( 64 / FT_CHAR_BIT ) #define FT_INT64 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 @@ -190,12 +194,7 @@ */ #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) -#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L - -#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++) */ +#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the `__int64` type */ #define FT_INT64 __int64 @@ -225,7 +224,7 @@ #define FT_INT64 long long int #define FT_UINT64 unsigned long long int -#endif /* __STDC_VERSION__ >= 199901L */ +#endif /* !__STDC__ */ #endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ |