From: Alan Third <alan@idiocy.org>
Date: Wed, 24 May 2017 18:40:19 +0000 (+0100)
Subject: Define new types on macOS 10.6 (bug#27041)
X-Git-Tag: emacs-26.0.90~521^2~279
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d61d443fc0559314a2c22b1c120091de88585935;p=emacs.git

Define new types on macOS 10.6 (bug#27041)

* src/nsterm.h: Enable instancetype typedef for older macOS, and use
correct NSUInteger instead of int.
---

diff --git a/src/nsterm.h b/src/nsterm.h
index 443a40ed6f5..d98f0d03d39 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -62,11 +62,13 @@ typedef CGFloat EmacsCGFloat;
 typedef float EmacsCGFloat;
 #endif
 
-/* FIXME: It looks as though instancetype will be supported in GNUstep
-   at some point, but I'm not sure what version. */
-#ifdef NS_IMPL_GNUSTEP
+/* FIXME: instancetype is a language built-in, but older versions of
+   Clang don't support it, and I don't know if GCC supports it at all.
+   Should this be tested for in ./configure? */
+#if defined (NS_IMPL_GNUSTEP)
+    || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 typedef id instancetype;
-typedef int NSWindowStyleMask;
+typedef NSUInteger NSWindowStyleMask;
 #endif
 
 /* ==========================================================================