[Emacs-diffs] trunk r117520: Add ifdef NS_IMPL_COCOA aound OSX version check (for clang)

[Jan D.]

------------------------------------------------------------
revno: 117520
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2014-07-11 18:33:17 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-11 15:44:25 +0000
+++ b/src/ChangeLog     2014-07-11 16:33:17 +0000
@@ -1,3 +1,9 @@
+2014-07-11  Jan Djärv  <address@hidden>
+
+       * nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA.
+
+       * nsfns.m (Fns_popup_font_panel): Ditto.
+
 2014-07-11  Eli Zaretskii  <address@hidden>
 
        * minibuf.c (read_minibuf_noninteractive): Finish reading on '\r',

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2014-06-01 08:23:18 +0000
+++ b/src/nsfns.m       2014-07-11 16:33:17 +0000
@@ -1390,10 +1390,12 @@
   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];
   return Qnil;

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-06-30 18:44:56 +0000
+++ b/src/nsterm.m      2014-07-11 16:33:17 +0000
@@ -5012,10 +5012,12 @@
 
   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]))
     {