diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-02-07 07:37:07 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2023-02-08 21:09:30 +0100 |
| commit | 37bc7c260401e7e34b77d9e04d4c32bf760e1672 (patch) | |
| tree | 179789fb20552d0dae82d719899259df006ef383 /include | |
| parent | da9eb9c719bb128cb2e13c7cc9a7ded4abce448d (diff) | |
| download | freetype2-37bc7c260401e7e34b77d9e04d4c32bf760e1672.tar.gz | |
Avoid reserved identifiers that are globally defined.
This is mandated by the C99 standard, and clang 15 produces zillions of
warnings otherwise.
* devel/ftoption.h, include/freetype/config/ftoption.h,
include/freetype/internal/ftmemory.h, src/autofit/afhints.h,
src/autofit/afmodule.c, src/autofit/aftypes.h, src/base/ftadvanc.c,
src/base/ftdbgmem.c, src/base/ftstream.c, src/bdf/bdflib.c,
src/truetype/ttinterp.c: Replace identifiers of the form `_foo` with `foo_`.
Diffstat (limited to 'include')
| -rw-r--r-- | include/freetype/config/ftoption.h | 8 | ||||
| -rw-r--r-- | include/freetype/internal/ftmemory.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 4d618017f..9e03e1783 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -461,9 +461,9 @@ FT_BEGIN_HEADER * while compiling in 'release' mode): * * ``` - * _af_debug_disable_horz_hints - * _af_debug_disable_vert_hints - * _af_debug_disable_blue_hints + * af_debug_disable_horz_hints_ + * af_debug_disable_vert_hints_ + * af_debug_disable_blue_hints_ * ``` * * Additionally, the following functions provide dumps of various @@ -480,7 +480,7 @@ FT_BEGIN_HEADER * As an argument, they use another global variable: * * ``` - * _af_debug_hints + * af_debug_hints_ * ``` * * Please have a look at the `ftgrid` demo program to see how those diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h index cce5ea383..5eb1d21ff 100644 --- a/include/freetype/internal/ftmemory.h +++ b/include/freetype/internal/ftmemory.h @@ -96,15 +96,15 @@ extern "C++" #ifdef FT_DEBUG_MEMORY - FT_BASE( const char* ) _ft_debug_file; - FT_BASE( long ) _ft_debug_lineno; + FT_BASE( const char* ) ft_debug_file_; + FT_BASE( long ) ft_debug_lineno_; -#define FT_DEBUG_INNER( exp ) ( _ft_debug_file = __FILE__, \ - _ft_debug_lineno = __LINE__, \ +#define FT_DEBUG_INNER( exp ) ( ft_debug_file_ = __FILE__, \ + ft_debug_lineno_ = __LINE__, \ (exp) ) -#define FT_ASSIGNP_INNER( p, exp ) ( _ft_debug_file = __FILE__, \ - _ft_debug_lineno = __LINE__, \ +#define FT_ASSIGNP_INNER( p, exp ) ( ft_debug_file_ = __FILE__, \ + ft_debug_lineno_ = __LINE__, \ FT_ASSIGNP( p, exp ) ) #else /* !FT_DEBUG_MEMORY */ |