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

Fixes: debbugs:18030

diff --git a/src/ChangeLog b/src/ChangeLog
index 835a241cf9dd8fe0928e12d5e30fcd6ff777c8cc..d3874dbbadc422f545c85fa9656a99a3b9ee284d 100644 (file)
--- 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 202ebe10c9702ee650bf13f76244f81c2a54596c..13c7b0bce2c7978451a52f13eeccb42cb59d4c17 100644 (file)
--- 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;