diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-01-12 22:28:14 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-01-12 22:28:14 +0100 |
| commit | c09a90a2f16023db0167f95919865ca59770c939 (patch) | |
| tree | bee0e30da03c9ed3360ea887b976ee962a82fd25 /src/cache/ftccache.h | |
| parent | 9d0b76d7f6e87b68ee739688be693f28094b23bf (diff) | |
| download | freetype2-c09a90a2f16023db0167f95919865ca59770c939.tar.gz | |
Don't use macro names that start with `_[A-Z]' [3/3].
Such macro names are reserved for both C and C++.
* src/cache/ftccache.h: s/_FTC_FACE_ID_HASH/FTC_FACE_ID_HASH/.
Update all callers.
(FTC_CACHE_LOOKUP_CMP): Replace `_XXX' with `XXX_'.
* src/cache/ftcmru.c (FTC_MRULIST_LOOKUP_CMP): Ditto.
Diffstat (limited to 'src/cache/ftccache.h')
| -rw-r--r-- | src/cache/ftccache.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cache/ftccache.h b/src/cache/ftccache.h index 1b5bd3b97..8a700d719 100644 --- a/src/cache/ftccache.h +++ b/src/cache/ftccache.h @@ -24,8 +24,8 @@ FT_BEGIN_HEADER -#define _FTC_FACE_ID_HASH( i ) \ - ( ( (FT_Offset)(i) >> 3 ) ^ ( (FT_Offset)(i) << 7 ) ) +#define FTC_FACE_ID_HASH( i ) \ + ( ( (FT_Offset)(i) >> 3 ) ^ ( (FT_Offset)(i) << 7 ) ) /* handle to cache object */ typedef struct FTC_CacheRec_* FTC_Cache; @@ -228,7 +228,7 @@ FT_BEGIN_HEADER { \ _node = *_pnode; \ if ( _node == NULL ) \ - goto _NewNode; \ + goto NewNode_; \ \ if ( _node->hash == _hash && \ _nodcomp( _node, query, _cache, &_list_changed ) ) \ @@ -248,7 +248,7 @@ FT_BEGIN_HEADER if ( *_pnode == NULL ) \ { \ FT_ERROR(( "FTC_CACHE_LOOKUP_CMP: oops!!! node missing\n" )); \ - goto _NewNode; \ + goto NewNode_; \ } \ else \ _pnode = &((*_pnode)->link); \ @@ -273,12 +273,12 @@ FT_BEGIN_HEADER FTC_MruNode_Up( (FTC_MruNode*)_nl, \ (FTC_MruNode)_node ); \ } \ - goto _Ok; \ + goto Ok_; \ \ - _NewNode: \ + NewNode_: \ error = FTC_Cache_NewNode( _cache, _hash, query, &_node ); \ \ - _Ok: \ + Ok_: \ node = _node; \ FT_END_STMNT |