From: Alan Third <alan@idiocy.org>
To: npostavs@users.sourceforge.net
Cc: 27041@debbugs.gnu.org, "Charles A. Roelli" <charles@aurox.ch>
Subject: bug#27041: [PATCH] Check if instancetype supported in ObjC
Date: Thu, 25 May 2017 19:46:35 +0100 [thread overview]
Message-ID: <20170525184635.GA34187@breton.holly.idiocy.org> (raw)
In-Reply-To: <87shjt65o7.fsf_-_@users.sourceforge.net>
* configure.ac: Add check for instancetype.
* src/nsterm.h [!NATIVE_OBJC_INSTANCETYPE]: Define instancetype.
---
configure.ac | 17 +++++++++++++++++
src/nsterm.h | 20 +++++++++++---------
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6d23b5d214..b525666a85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1980,6 +1980,23 @@ AC_DEFUN
AC_SUBST(NS_OBJ)
AC_SUBST(NS_OBJC_OBJ)
+AC_CACHE_CHECK(
+ [if the Objective C compiler supports instancetype],
+ [emacs_cv_objc_instancetype],
+ [AC_LANG_PUSH([Objective C])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE([[@interface Test
+ + (instancetype)test;
+ @end]])],
+ emacs_cv_objc_instancetype=yes,
+ emacs_cv_objc_instancetype=no)
+ AC_LANG_POP([Objective C])])
+
+if test x$emacs_cv_objc_instancetype = xyes ; then
+ AC_DEFINE(NATIVE_OBJC_INSTANCETYPE, 1,
+ [Define if ObjC compiler supports instancetype natively.])
+fi
+
HAVE_W32=no
W32_OBJ=
W32_LIBS=
diff --git a/src/nsterm.h b/src/nsterm.h
index 8f3d92b353..f75e3759e4 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -62,15 +62,6 @@ typedef CGFloat EmacsCGFloat;
typedef float EmacsCGFloat;
#endif
-/* 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_10
-typedef id instancetype;
-typedef NSUInteger NSWindowStyleMask;
-#endif
-
/* ==========================================================================
Trace support
@@ -365,6 +356,12 @@ char const * nstrace_fullscreen_type_name (int);
#endif
+/* If the compiler doesn't support instancetype, map it to id. */
+#ifndef NATIVE_OBJC_INSTANCETYPE
+typedef id instancetype;
+#endif
+
+
/* ==========================================================================
NSColor, EmacsColor category.
@@ -1302,6 +1299,11 @@ extern char gnustep_base_version[]; /* version tracking */
#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask
#define NSAlertStyleCritical NSCriticalAlertStyle
#define NSControlSizeRegular NSRegularControlSize
+
+/* And adds NSWindowStyleMask. */
+#ifdef __OBJC__
+typedef NSUInteger NSWindowStyleMask;
+#endif
#endif
#endif /* HAVE_NS */
--
Looks like this does the trick. Thanks Noam!
Charles, could you confirm this patch builds on 10.6?
--
Alan Third
next prev parent reply other threads:[~2017-05-25 18:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 18:57 bug#27041: MacOS 10.6: fix NS build Charles A. Roelli
2017-05-23 19:49 ` Alan Third
2017-05-24 18:13 ` Charles A. Roelli
2017-05-24 19:03 ` Alan Third
[not found] ` <handler.27041.D27041.149565262621210.notifdone@debbugs.gnu.org>
2017-05-25 2:17 ` npostavs
2017-05-25 18:46 ` Alan Third [this message]
2017-05-25 23:42 ` bug#27041: [PATCH] Check if instancetype supported in ObjC npostavs
2017-05-26 19:25 ` Charles A. Roelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170525184635.GA34187@breton.holly.idiocy.org \
--to=alan@idiocy.org \
--cc=27041@debbugs.gnu.org \
--cc=charles@aurox.ch \
--cc=npostavs@users.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).