[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Simon Hausmann]

 src/harfbuzz-global.h |    2 +-
 src/harfbuzz-open.c   |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
Author: Simon Hausmann <simon.hausmann at nokia.com>
Date:   Wed Jun 16 09:56:26 2010 +0200

    Fix compilation with RVCT
    
    Disable structure packaging with RVCT for the moment

diff --git a/src/harfbuzz-global.h b/src/harfbuzz-global.h
index 5b2b679..bccd6a2 100644
--- a/src/harfbuzz-global.h
+++ b/src/harfbuzz-global.h
@@ -39,7 +39,7 @@
 #define HB_END_HEADER  /* nothing */
 #endif
 
-#if defined(__GNUC__) || defined(__ARMCC__) || defined(__CC_ARM) || defined(_MSC_VER)
+#if defined(__GNUC__) || defined(_MSC_VER)
 #define HB_USE_PACKED_STRUCTS
 #endif
 
commit 392deb54d95e5238b9855267e1a236246bdd753a
Author: Andreas Kling <andreas.kling at nokia.com>
Date:   Wed Jun 16 00:10:16 2010 +0200

    Build fix for C90 compilers (mixed declarations and code)
    
    Signed-off-by: Simon Hausmann <simon.hausmann at nokia.com>

diff --git a/src/harfbuzz-open.c b/src/harfbuzz-open.c
index 4fc6ed1..255b7e6 100644
--- a/src/harfbuzz-open.c
+++ b/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;