[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic vcl/source

[Michael Stahl]

 vcl/generic/glyphs/gcach_ftyp.cxx       |    2 +-
 vcl/source/glyphs/graphite_features.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 583bee1ca0804c351fc8e44ee0c0442d22600d80
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 6 13:01:55 2013 +0100

    vcl: WORDS_BIGENDIAN is never defined, use OSL_BIGENDIAN
    
    Change-Id: I5186904b9703d6c9c49ca4c3b4a62f83423b1ae1
    (cherry picked from commit 94d31d9ad1513504bb1415f0cfe70be380e18b9a)
    Reviewed-on: https://gerrit.libreoffice.org/6612
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index e3d65d9..854433b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -275,7 +275,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
     } TableId;
     TableId tableId;
     tableId.m_id = name;
-#ifndef WORDS_BIGENDIAN
+#ifndef OSL_BIGENDIAN
     TableId swapped;
     swapped.m_c[3] = tableId.m_c[0];
     swapped.m_c[2] = tableId.m_c[1];
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index ec33500..6801140 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -219,7 +219,7 @@ gr_uint32 GrFeatureParser::getCharId(const OString & id, size_t offset, size_t l
 {
     FeatId charId;
     charId.num = 0;
-#ifdef WORDS_BIGENDIAN
+#ifdef OSL_BIGENDIAN
     for (size_t i = 0; i < length; i++)
     {
         charId.label[i] = id[offset+i];