diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-01 22:02:40 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-01 22:02:40 +0200 |
| commit | 09b20bd9c157f8b7dde5f534a4d2366b27a33a2b (patch) | |
| tree | 04bda80b1fe597d1b9bc183d9bee7fec5a1c8092 /src/3rdparty/freetype/src/base/fttrigon.c | |
| parent | 22b60030490cf4b6418e9faab1559b658db1a887 (diff) | |
| parent | a4aeb081769cd0f5817c8e84b4740f315aa3b673 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into tqtc/lts-6.2-opensource
Change-Id: I498f628eea18ec7b5fa3f14c12bb953f0d13663c
Diffstat (limited to 'src/3rdparty/freetype/src/base/fttrigon.c')
| -rw-r--r-- | src/3rdparty/freetype/src/base/fttrigon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/freetype/src/base/fttrigon.c b/src/3rdparty/freetype/src/base/fttrigon.c index c6f027cf61..6964edb0f5 100644 --- a/src/3rdparty/freetype/src/base/fttrigon.c +++ b/src/3rdparty/freetype/src/base/fttrigon.c @@ -4,7 +4,7 @@ * * FreeType trigonometric functions (body). * - * Copyright (C) 2001-2020 by + * Copyright (C) 2001-2022 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -53,7 +53,7 @@ }; -#ifdef FT_LONG64 +#ifdef FT_INT64 /* multiply a given value by the CORDIC shrink factor */ static FT_Fixed @@ -76,7 +76,7 @@ return s < 0 ? -val : val; } -#else /* !FT_LONG64 */ +#else /* !FT_INT64 */ /* multiply a given value by the CORDIC shrink factor */ static FT_Fixed @@ -125,7 +125,7 @@ return s < 0 ? -val : val; } -#endif /* !FT_LONG64 */ +#endif /* !FT_INT64 */ /* undefined and never called for zero vector */ |