summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2010-06-15 22:05:29 (GMT)
committerAndreas Kling <andreas.kling@nokia.com>2010-06-15 22:05:29 (GMT)
commit277339cdcb5e0adac6ff669745a5390f2bf089b2 (patch)
tree2033d103076512485044ed0dab25a37a92b20080
parent6d9374686d8c41b89ce74836b76e157629c2f531 (diff)
downloadQt-277339cdcb5e0adac6ff669745a5390f2bf089b2.zip
Qt-277339cdcb5e0adac6ff669745a5390f2bf089b2.tar.gz
Qt-277339cdcb5e0adac6ff669745a5390f2bf089b2.tar.bz2
Buildfix for MSVC2008 (C90 violation)
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-open.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open.c b/src/3rdparty/harfbuzz/src/harfbuzz-open.c
index 4fc6ed1..255b7e6 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-open.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-open.c
@@ -1285,6 +1285,7 @@ HB_INTERNAL HB_Error
_HB_OPEN_Load_Device( HB_Device** device,
HB_Stream stream )
{
+ HB_Device* d;
HB_Error error;
HB_UShort n, count;
@@ -1301,7 +1302,7 @@ _HB_OPEN_Load_Device( HB_Device** device,
return error;
}
- HB_Device* d = *device;
+ d = *device;
d->StartSize = GET_UShort();
d->EndSize = GET_UShort();
@@ -1402,6 +1403,7 @@ _HB_OPEN_Get_Device( HB_Device** device,
HB_UShort size,
HB_Short* value )
{
+ HB_Device* d;
HB_UShort byte, bits, mask, f, s;
HB_Error error;
@@ -1411,7 +1413,7 @@ _HB_OPEN_Get_Device( HB_Device** device,
return error;
}
- HB_Device* d = *device;
+ d = *device;
f = d->DeltaFormat;