diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-10 19:16:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-10 19:49:40 +0300 |
| commit | 590d851f7fc66b8a0fd3d2a08aa059ee747d7468 (patch) | |
| tree | 7c941c95bc03e03a26a77bd0e3886b0f86f34118 | |
| parent | b49e42f358bc37c77824028ffadc6f51b9d12172 (diff) | |
Avoid pointless ifdef for iOS inside code not compiled for iOS anyway
The whole of svpbmp.cxx and svpvd.cxx are nowadays ifdeffed out for iOS.
Change-Id: Iac1f66457dc315ea86f86d12e1f6eb5bf4bcbb8c
| -rw-r--r-- | vcl/headless/svpbmp.cxx | 2 | ||||
| -rw-r--r-- | vcl/headless/svpvd.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 03a8a90dc487..3e08e900227f 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -53,7 +53,7 @@ bool SvpSalBitmap::Create( const Size& rSize, case 16: nFormat = FORMAT_SIXTEEN_BIT_LSB_TC_MASK; break; #endif case 24: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break; -#if defined(ANDROID) || defined(IOS) +#ifdef ANDROID case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; break; #else case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; break; diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index d9ca7d2e5619..e5a20b58fcac 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -81,7 +81,7 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, const ba #endif case 24: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break; case 32: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA; break; -#if defined(ANDROID) || defined(IOS) +#ifdef ANDROID case 0: nFormat = FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA; break; #else case 0: nFormat = FORMAT_TWENTYFOUR_BIT_TC_MASK; break; |