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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 282b79eef127b0a18cda98d5e03a063e56ba3a6c..2838d3f692a5b601bc4bd9585cb2b30c8089e58b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA.
+
+       * nsfns.m (Fns_popup_font_panel): Ditto.
+
 2014-07-11  Eli Zaretskii  <eliz@gnu.org>
 
        * minibuf.c (read_minibuf_noninteractive): Finish reading on '\r',

diff --git a/src/nsfns.m b/src/nsfns.m
index 5f9588aea6456f6ced15c3d7f244a02e4e4186e9..b49aec43b65ed7a13456380b1242c3f213481604 100644 (file)
--- 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 f2eeeda93bf169eec752f6c7544caca4cd72bd4c..3a570628cbede30aad2bdee10c4127348eb41a9a 100644 (file)
--- 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]))