From 208e712de049f01d23e18dfe4fda5ee019fe5191 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 27 Mar 2017 20:56:23 +0200 Subject: [PATCH] [cid, truetype] Don't use `index' as a variable name. At least on FreeBSD there is a global declaration of `index' in file `/usr/include/strings.h'. * src/cff/cf2intrp.c, src/truetype/ttgload.c: s/index/idx/ where appropriate. --- ChangeLog | 10 ++++++++++ src/truetype/ttgload.c | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e5eee668..a2afd1598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-03-27 Werner Lemberg + + [cid, truetype] Don't use `index' as a variable name. + + At least on FreeBSD there is a global declaration of `index' in file + `/usr/include/strings.h'. + + * src/cff/cf2intrp.c, src/truetype/ttgload.c: s/index/idx/ where + appropriate. + 2017-03-27 Wojciech Mamrak [sfnt] Minor improvement for handling kern tables. diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 9cdcf1012..35b62d0eb 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -1394,7 +1394,7 @@ /* a utility function to retrieve i-th node from given FT_List */ static FT_ListNode ft_list_get_node_at( FT_List list, - FT_UInt index ) + FT_UInt idx ) { FT_ListNode cur; @@ -1404,10 +1404,10 @@ for ( cur = list->head; cur; cur = cur->next ) { - if ( !index ) + if ( !idx ) return cur; - index--; + idx--; } return NULL;