diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-07-21 22:56:56 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-07-29 09:29:56 +0000 |
| commit | 6484b2fda3b4fa0059526e81cd1e26cca46cb705 (patch) | |
| tree | b065f09d3a69ee27ad57c1736e88e21d4c72f6b2 /include/osl/endian.h | |
| parent | 029fa6477bfed71881c3287799f5bdffd3285f92 (diff) | |
endian.h: avoid some Wconversion warnings
Change-Id: Ic77bd0dd6ac2355eaf3e11811fba7604c782d9d6
Reviewed-on: https://gerrit.libreoffice.org/17307
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include/osl/endian.h')
| -rw-r--r-- | include/osl/endian.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/osl/endian.h b/include/osl/endian.h index 0819deebba41..530549308d6e 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)) |