From 1ec98b29ec0b9cd6ab138aac44e34562706b0016 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 31 Aug 2014 08:47:11 +0200 Subject: [PATCH] Don't use `register' keyword. Fixes compiler warnings. * src/base/ftcalc.c (FT_Add64) [!FT_LONG64]: Do it. * src/gzip/inftrees.c (huft_build): Ditto. * src/truetype/ttinterp.c (TT_MulFix14_arm): Ditto. --- ChangeLog | 8 ++++++++ src/base/ftcalc.c | 2 +- src/gzip/inftrees.c | 10 +++++----- src/truetype/ttinterp.c | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16dbaafb1..1824c0cce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-08-31 Behdad Esfahbod + + Don't use `register' keyword. Fixes compiler warnings. + + * src/base/ftcalc.c (FT_Add64) [!FT_LONG64]: Do it. + * src/gzip/inftrees.c (huft_build): Ditto. + * src/truetype/ttinterp.c (TT_MulFix14_arm): Ditto. + 2014-08-24 Alexei Podtelezhnikov [truetype] Optimize DELTAP and DELTAC. diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 8eed4ceca..a12007189 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -347,7 +347,7 @@ FT_Int64* y, FT_Int64 *z ) { - register FT_UInt32 lo, hi; + FT_UInt32 lo, hi; lo = x->lo + y->lo; diff --git a/src/gzip/inftrees.c b/src/gzip/inftrees.c index ef5365216..56f52b170 100644 --- a/src/gzip/inftrees.c +++ b/src/gzip/inftrees.c @@ -115,16 +115,16 @@ uIntf *v /* working area: values in order of bit length */ uInt f; /* i repeats in table every f entries */ int g; /* maximum code length */ int h; /* table level */ - register uInt i; /* counter, current code */ - register uInt j; /* counter */ - register int k; /* number of bits in current code */ + uInt i; /* counter, current code */ + uInt j; /* counter */ + int k; /* number of bits in current code */ int l; /* bits per table (returned in m) */ uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ - register uIntf *p; /* pointer into c[], b[], or v[] */ + uIntf *p; /* pointer into c[], b[], or v[] */ inflate_huft *q; /* points to current table */ struct inflate_huft_s r; /* table entry for structure assignment */ inflate_huft *u[BMAX]; /* table stack */ - register int w; /* bits before this table == (l * h) */ + int w; /* bits before this table == (l * h) */ uInt x[BMAX+1]; /* bit offsets, then code stack */ uIntf *xp; /* pointer into x */ int y; /* number of dummy codes added */ diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index dd75cce11..1f8debf0a 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -1446,7 +1446,7 @@ TT_MulFix14_arm( FT_Int32 a, FT_Int b ) { - register FT_Int32 t, t2; + FT_Int32 t, t2; #if defined( __CC_ARM ) || defined( __ARMCC__ )