From 47571310770234371eb6e361214056efd1b67137 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Fri, 11 Jul 2014 18:33:17 +0200 Subject: [PATCH] Add ifdef NS_IMPL_COCOA aound OSX version check (for clang) * nsfns.m (Fns_popup_font_panel): Ditto. * nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA. --- src/ChangeLog | 6 ++++++ src/nsfns.m | 2 ++ src/nsterm.m | 2 ++ 3 files changed, 10 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 282b79eef12..2838d3f692a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-07-11 Jan Djärv + + * nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA. + + * nsfns.m (Fns_popup_font_panel): Ditto. + 2014-07-11 Eli Zaretskii * minibuf.c (read_minibuf_noninteractive): Finish reading on '\r', diff --git a/src/nsfns.m b/src/nsfns.m index 5f9588aea64..b49aec43b65 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1390,9 +1390,11 @@ DEFUN ("ns-popup-font-panel", Fns_popup_font_panel, Sns_popup_font_panel, NSFont *nsfont; if (EQ (font->driver->type, Qns)) nsfont = ((struct nsfont_info *)font)->nsfont; +#ifdef NS_IMPL_COCOA #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 else nsfont = (NSFont *) macfont_get_nsctfont (font); +#endif #endif [fm setSelectedFont: nsfont isMultiple: NO]; [fm orderFrontFontPanel: NSApp]; diff --git a/src/nsterm.m b/src/nsterm.m index f2eeeda93bf..3a570628cbe 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5012,9 +5012,11 @@ not_in_argv (NSString *arg) if (EQ (font->driver->type, Qns)) nsfont = ((struct nsfont_info *)font)->nsfont; +#ifdef NS_IMPL_COCOA #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 else nsfont = (NSFont *) macfont_get_nsctfont (font); +#endif #endif if ((newFont = [sender convertFont: nsfont])) -- 2.39.5