Author: theraven
Date: Wed Dec 7 21:17:50 2011
New Revision: 228330
URL: http://svn.freebsd.org/changeset/base/228330
Log:
As per das@'s suggestion, s/__noreturn/_Noreturn/, since the latter is an
identifier reserved for the implementation in C99 and earlier so there is
no sensible reason for introducing yet another reserved identifier when we
could just use the one C1x uses.
Approved by: brooks (mentor)
Modified:
head/include/stdlib.h
head/sys/sys/cdefs.h
Modified: head/include/stdlib.h
==============================================================================
--- head/include/stdlib.h Wed Dec 7 21:02:35 2011 (r228329)
+++ head/include/stdlib.h Wed Dec 7 21:17:50 2011 (r228330)
@@ -76,7 +76,7 @@ extern int __mb_cur_max;
extern int ___mb_cur_max(void);
#define MB_CUR_MAX (___mb_cur_max())
-__noreturn void abort(void);
+_Noreturn void abort(void);
int abs(int) __pure2;
int atexit(void (*)(void));
double atof(const char *);
@@ -86,7 +86,7 @@ void *bsearch(const void *, const void *
size_t, int (*)(const void *, const void *));
void *calloc(size_t, size_t) __malloc_like;
div_t div(int, int) __pure2;
-__noreturn void exit(int);
+_Noreturn void exit(int);
void free(void *);
char *getenv(const char *);
long labs(long) __pure2;
@@ -145,14 +145,14 @@ unsigned long long
strtoull(const char * __restrict, char ** __restrict, int);
#endif /* __LONG_LONG_SUPPORTED */
-__noreturn void _Exit(int);
+_Noreturn void _Exit(int);
#endif /* __ISO_C_VISIBLE >= 1999 */
/*
* If we're in a mode greater than C99, expose C1x functions.
*/
#if __ISO_C_VISIBLE > 1999
-__noreturn void quick_exit(int)
+_Noreturn void quick_exit(int)
int
at_quick_exit(void (*func)(void));
#endif /* __ISO_C_VISIBLE > 1999 */
Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h Wed Dec 7 21:02:35 2011 (r228329)
+++ head/sys/sys/cdefs.h Wed Dec 7 21:17:50 2011 (r228330)
@@ -220,13 +220,13 @@
#if defined(__cplusplus) && __cplusplus >= 201103L
-#define __noreturn [[noreturn]]
+#define _Noreturn [[noreturn]]
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ > 201000L
-#define __noreturn _Noreturn
+/* Do nothing - _Noreturn is a keyword */
#elif defined(__GNUC__)
-#define __noreturn __attribute__((__noreturn__))
+#define _Noreturn __attribute__((__noreturn__))
#else
-#define __noreturn
+#define _Noreturn
#endif
#if __GNUC_PREREQ__(2, 96)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
