From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 5 Oct 2014 17:51:11 +0000 (+0200)
Subject: * nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than 0.23.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=223ed51dc5e78444db5601397ff77ad2e36577bc;p=emacs.git

* nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than 0.23.

Fixes: debbugs:18030
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 835a241cf9d..d3874dbbadc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-10-05  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* 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
diff --git a/src/nsfont.m b/src/nsfont.m
index 202ebe10c97..13c7b0bce2c 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1039,8 +1039,13 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
   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;