[Emacs-diffs] trunk r118054: * nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than 0.23.

[Jan D.]

------------------------------------------------------------
revno: 118054
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18030
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-05 19:51:11 +0200
message:
  * nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than 0.23.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfont.m                   nsfont.m-20091113204419-o5vbwnq5f7feedwu-8748

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-05 15:46:10 +0000
+++ b/src/ChangeLog     2014-10-05 17:51:11 +0000
@@ -1,5 +1,8 @@
 2014-10-05  Jan Djärv  <address@hidden>
 
+       * nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than
+       0.23 (Bug#18030).
+
        * nsterm.m (syms_of_nsterm): ns-use-fullscreen-animation is new.
        (toggleFullScreen:): Use ns-use-fullscreen-animation for animate.
        (ns_select, ns_read_socket): Use unwind_protect to decrease

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2014-08-25 07:00:42 +0000
+++ b/src/nsfont.m      2014-10-05 17:51:11 +0000
@@ -1039,8 +1039,13 @@
   static unsigned char cbuf[1024];
   unsigned char *c = cbuf;
 #ifdef NS_IMPL_GNUSTEP
+#if GNUSTEP_GUI_MAJOR_VERSION > 0 || GNUSTEP_GUI_MINOR_VERSION > 22
+  static CGFloat advances[1024];
+  CGFloat *adv = advances;
+#else
   static float advances[1024];
   float *adv = advances;
+#endif
 #else
   static CGSize advances[1024];
   CGSize *adv = advances;