diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-08-18 23:05:51 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-08-18 23:05:51 -0400 |
| commit | 857038399a28b9379317b46317bb85634f969c9d (patch) | |
| tree | 818caace36a1a81c0c5af08ebf2e052acc807e92 /include | |
| parent | e2cceed857f0b4f3f3fd48681d2f3009e62d1194 (diff) | |
| download | freetype2-857038399a28b9379317b46317bb85634f969c9d.tar.gz | |
Use FT_INT64 instead of FT_LONG64.
* include/freetype/config/integer-types.h: Remove synonymous FT_LONG64.
* include/freetype/internal/ftcalc.h: s/FT_LONG64/FT_INT64/.
* src/base/ftcalc.c: Ditto.
* src/base/fttrigon.c: Ditto.
* src/smooth/ftgrays.c: Ditto.
Diffstat (limited to 'include')
| -rw-r--r-- | include/freetype/config/integer-types.h | 9 | ||||
| -rw-r--r-- | include/freetype/internal/ftcalc.h | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/freetype/config/integer-types.h b/include/freetype/config/integer-types.h index 4bb3eedab..0f3f3ee2b 100644 --- a/include/freetype/config/integer-types.h +++ b/include/freetype/config/integer-types.h @@ -178,8 +178,6 @@ /* Autoconf */ #if FT_SIZEOF_LONG == ( 64 / FT_CHAR_BIT ) - /* `FT_LONG64` must be defined if a 64-bit type is available */ -#define FT_LONG64 #define FT_INT64 long #define FT_UINT64 unsigned long @@ -194,14 +192,12 @@ #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L -#define FT_LONG64 #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 */ -#define FT_LONG64 #define FT_INT64 __int64 #define FT_UINT64 unsigned __int64 @@ -211,7 +207,6 @@ /* to test the compiler version. */ /* this compiler provides the `__int64` type */ -#define FT_LONG64 #define FT_INT64 __int64 #define FT_UINT64 unsigned __int64 @@ -221,14 +216,12 @@ #elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */ -#define FT_LONG64 #define FT_INT64 long long int #define FT_UINT64 unsigned long long int #elif defined( __GNUC__ ) /* GCC provides the `long long` type */ -#define FT_LONG64 #define FT_INT64 long long int #define FT_UINT64 unsigned long long int @@ -236,7 +229,7 @@ #endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ -#ifdef FT_LONG64 +#ifdef FT_INT64 typedef FT_INT64 FT_Int64; typedef FT_UINT64 FT_UInt64; #endif diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index 15025e871..f24930792 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h @@ -487,7 +487,7 @@ FT_BEGIN_HEADER #define NEG_INT32( a ) \ (FT_Int32)( (FT_UInt32)0 - (FT_UInt32)(a) ) -#ifdef FT_LONG64 +#ifdef FT_INT64 #define ADD_INT64( a, b ) \ (FT_Int64)( (FT_UInt64)(a) + (FT_UInt64)(b) ) @@ -498,7 +498,7 @@ FT_BEGIN_HEADER #define NEG_INT64( a ) \ (FT_Int64)( (FT_UInt64)0 - (FT_UInt64)(a) ) -#endif /* FT_LONG64 */ +#endif /* FT_INT64 */ FT_END_HEADER |