[Libreoffice-commits] core.git: include/osl

[Matteo Casalin]

 include/osl/endian.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6484b2fda3b4fa0059526e81cd1e26cca46cb705
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Tue Jul 21 22:56:56 2015 +0200

    endian.h: avoid some Wconversion warnings
    
    Change-Id: Ic77bd0dd6ac2355eaf3e11811fba7604c782d9d6
    Reviewed-on: https://gerrit.libreoffice.org/17307
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 0819dee..5305493 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -161,7 +161,7 @@ extern "C" {
 #endif
 
 #ifndef OSL_MAKEWORD
-#   define OSL_MAKEWORD(bl, bh)    ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
+#   define OSL_MAKEWORD(bl, bh)    ((sal_uInt16)((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8)))
 #endif
 #ifndef OSL_LOBYTE
 #   define OSL_LOBYTE(w)           ((sal_uInt8)((sal_uInt16)(w) & 0xFF))