aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-06-24 21:31:31 +0300
committerEli Zaretskii2012-06-24 21:31:31 +0300
commit5e0881ddc41b1c01cdd30fc366af7375877eb0a5 (patch)
tree828786bce493004fe0ce44c2ebab9d0ebc9d7816
parent7583a3a10ac038edd25f9ed6ec321c85e62e75b6 (diff)
downloademacs-5e0881ddc41b1c01cdd30fc366af7375877eb0a5.tar.gz
emacs-5e0881ddc41b1c01cdd30fc366af7375877eb0a5.zip
nt/config.nt (_Noreturn): Don't reference __SUNPRO_C.
Fixes: debbugs:11750
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/config.nt3
2 files changed, 5 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 088a19ac747..8e24ee540cf 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12012-06-24 Eli Zaretskii <eliz@gnu.org>
2
3 * config.nt (_Noreturn): Don't reference __SUNPRO_C.
4
12012-06-24 Paul Eggert <eggert@cs.ucla.edu> 52012-06-24 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Switch from NO_RETURN to C11's _Noreturn (Bug#11750). 7 Switch from NO_RETURN to C11's _Noreturn (Bug#11750).
diff --git a/nt/config.nt b/nt/config.nt
index 8c66d3d6ebd..93a7f7b57a7 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -498,8 +498,7 @@ extern char *getenv ();
498/* The _Noreturn keyword of C11. */ 498/* The _Noreturn keyword of C11. */
499#if ! (defined _Noreturn \ 499#if ! (defined _Noreturn \
500 || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) 500 || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
501# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ 501# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__))
502 || 0x5110 <= __SUNPRO_C)
503# define _Noreturn __attribute__ ((__noreturn__)) 502# define _Noreturn __attribute__ ((__noreturn__))
504# elif defined _MSC_VER && 1200 <= _MSC_VER 503# elif defined _MSC_VER && 1200 <= _MSC_VER
505# define _Noreturn __declspec (noreturn) 504# define _Noreturn __declspec (noreturn)