From cd3dd85e1f74b53536244963f99078d2c61d2cf7 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 5 Nov 2014 16:01:11 -0800 Subject: [PATCH] Fix cfg for linux/android --- src/scaled_font.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/scaled_font.rs b/src/scaled_font.rs index 5bfa2ef..09cd2ac 100644 --- a/src/scaled_font.rs +++ b/src/scaled_font.rs @@ -39,8 +39,7 @@ pub mod android { pub type SkTypeface = *mut c_void; -#[cfg(target_os="linux")] -#[cfg(target_os="android")] +#[cfg(any(target_os="linux", target_os = "android"))] pub enum FontInfo<'a> { NativeFont(FT_Face), FontData(&'a Vec), @@ -63,8 +62,7 @@ impl ScaledFont { self.azure_scaled_font } - #[cfg(target_os="linux")] - #[cfg(target_os="android")] + #[cfg(any(target_os="linux", target_os = "android"))] pub fn new(backend: BackendType, font_info: FontInfo, size: AzFloat) -> ScaledFont { use azure::AZ_NATIVE_FONT_SKIA_FONT_FACE;