From e36aac940a36cbe4e7c3164adb0cf289e522d13d Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 24 Jun 2012 20:40:25 -0700
Subject: [PATCH] Fix mac breakage

---
 src/servo/text/native_font.rs                    | 2 +-
 src/servo/text/native_font/ft_native_font.rs     | 1 -
 src/servo/text/native_font/quartz_native_font.rs | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/servo/text/native_font.rs b/src/servo/text/native_font.rs
index abd78f244e9..0895441d257 100644
--- a/src/servo/text/native_font.rs
+++ b/src/servo/text/native_font.rs
@@ -16,7 +16,7 @@ type NativeFont/& = quartz_native_font::QuartzNativeFont;
 type NativeFont/& = ft_native_font::FreeTypeNativeFont;
 
 #[cfg(target_os = "macos")]
-fn with_test_native_font(f: fn@(NativeFont)) {
+fn with_test_native_font(f: fn@(nf: &NativeFont)) {
     quartz_native_font::with_test_native_font(f);
 }
 
diff --git a/src/servo/text/native_font/ft_native_font.rs b/src/servo/text/native_font/ft_native_font.rs
index e95ff636d6a..bceaee390dd 100644
--- a/src/servo/text/native_font/ft_native_font.rs
+++ b/src/servo/text/native_font/ft_native_font.rs
@@ -85,7 +85,6 @@ impl methods for FT_Error {
     fn succeeded() -> bool { self == 0 as FT_Error }
 }
 
-#[cfg(target_os = "linux")]
 fn with_test_native_font(f: fn@(nf: &NativeFont)) {
     import font::test_font_bin;
     import unwrap_result = result::unwrap;
diff --git a/src/servo/text/native_font/quartz_native_font.rs b/src/servo/text/native_font/quartz_native_font.rs
index 795ceae718d..1f185d7579b 100644
--- a/src/servo/text/native_font/quartz_native_font.rs
+++ b/src/servo/text/native_font/quartz_native_font.rs
@@ -17,7 +17,6 @@ class QuartzNativeFont/& {
     }
 }
 
-#[cfg(target_os = "linux")]
-fn with_test_native_font(f: fn@(nf: &NativeFont)) {
+fn with_test_native_font(_f: fn@(nf: &NativeFont)) {
     fail
 }