From d61d443fc0559314a2c22b1c120091de88585935 Mon Sep 17 00:00:00 2001 From: Alan Third Date: Wed, 24 May 2017 19:40:19 +0100 Subject: [PATCH] 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. --- src/nsterm.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 /* ========================================================================== -- 2.39.2