Auto merge of #63 - staktrace:mlion, r=jdm

Flip the lion feature into a mountainlion feature which is additive rather than subtractive

This addresses @kvark's comment at https://github.com/servo/core-text-rs/pull/61#issuecomment-309853548

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/core-text-rs/63)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo
2017-06-21 07:53:22 -07:00
committed by GitHub
2 changed files with 7 additions and 6 deletions
+5 -4
View File
@@ -1,15 +1,16 @@
[package]
name = "core-text"
version = "5.0.1"
version = "6.0.0"
authors = ["The Servo Project Developers"]
description = "Bindings to the Core Text framework."
license = "MIT/Apache-2.0"
repository = "https://github.com/servo/core-text-rs"
[features]
default = []
# For OS X 10.7 compat, use this feature. It will exclude some things
lion = []
default = ["mountainlion"]
# For OS X 10.7 compat, exclude this feature. It will exclude some things from
# the exposed APIs in the crate.
mountainlion = []
[dependencies]
libc = "0.2"
+2 -2
View File
@@ -379,7 +379,7 @@ pub fn debug_font_traits(font: &CTFont) {
// println!("kCTFontSlantTrait: {}", traits.normalized_slant());
}
#[cfg(not(feature = "lion"))]
#[cfg(feature = "mountainlion")]
pub fn cascade_list_for_languages(font: &CTFont, language_pref_list: &CFArray) -> CFArray {
unsafe {
let font_collection_ref =
@@ -464,7 +464,7 @@ extern {
fn CTFontCopyName(font: CTFontRef, nameKey: CFStringRef) -> CFStringRef;
//fn CTFontCopyLocalizedName(font: CTFontRef, nameKey: CFStringRef,
// language: *CFStringRef) -> CFStringRef;
#[cfg(not(feature = "lion"))]
#[cfg(feature = "mountainlion")]
fn CTFontCopyDefaultCascadeListForLanguages(font: CTFontRef, languagePrefList: CFArrayRef) -> CFArrayRef;