[Emacs-diffs] trunk r114297: Fix compilation for GNUStep due to font changes.

[Jan D.]

------------------------------------------------------------
revno: 114297
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-15 21:43:32 +0200
message:
  Fix compilation for GNUStep due to font changes.
  
  * font.c (syms_of_font): Check MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
  for syms_of_macfont.
  
  * nsfns.m (Fx_create_frame): Fix font driver registration for
  GNUStep.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-15 17:58:46 +0000
+++ b/src/ChangeLog     2013-09-15 19:43:32 +0000
@@ -1,5 +1,11 @@
 2013-09-15  Jan Djärv  <address@hidden>
 
+       * nsfns.m (Fx_create_frame): Fix font driver registration for
+       GNUStep.
+
+       * font.c (syms_of_font): Check MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
+       for syms_of_macfont.
+
        * nsterm.m: Include macfont.h.
        (ns_tmp_flags, ns_tmp_font): Remove.
        (ns_compute_glyph_string_overhangs): Check for driver Qns.

=== modified file 'src/font.c'
--- a/src/font.c        2013-09-15 17:58:46 +0000
+++ b/src/font.c        2013-09-15 19:43:32 +0000
@@ -5199,7 +5199,9 @@
 #endif /* HAVE_NTGUI */
 #ifdef HAVE_NS
   syms_of_nsfont ();
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
   syms_of_macfont ();
+#endif
 #endif /* HAVE_NS */
 #endif /* HAVE_WINDOW_SYSTEM */
 }

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-09-15 17:58:46 +0000
+++ b/src/nsfns.m       2013-09-15 19:43:32 +0000
@@ -1175,15 +1175,14 @@
 
   block_input ();
 
-#ifdef NS_IMPL_GNUSTEP ||                               \
-  MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-  register_font_driver (&nsfont_driver, f);
-#else
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
   if (CTGetCoreTextVersion != NULL
       && CTGetCoreTextVersion () >= kCTVersionNumber10_5)
     mac_register_font_driver (f);
+#endif
+#endif
   register_font_driver (&nsfont_driver, f);
-#endif
 
   x_default_parameter (f, parms, Qfont_backend, Qnil,
                        "fontBackend", "FontBackend", RES_TYPE_STRING);