From d12704c78f04eb6c666143953e81dec89e1cadea Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 3 Jul 2014 01:32:17 +0530 Subject: Fix Wundef warning for __STDC_VERSION__ c4c4124473c187b5c4642611390897666c3d3970 added the _Noreturn macro for pre-C11 compilers, but it now throws a new Wundef warning during `make check` for __STDC_VERSION__ which gcc does not define by default. The following patch fixes this in line with other uses of __STDC_VERSION__ in the file. --- ChangeLog | 5 +++++ misc/sys/cdefs.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7b336046bf..049de91757 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-02 Roland McGrath + + * misc/sys/cdefs.h: Check if __STDC_VERSION__ is defined + before checking its value. + 2014-07-02 Siddhesh Poyarekar * intl/loadmsgcat.c (_nl_load_domain): Use __builtin_expect. diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index a5c3224a64..04db9563fb 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -382,7 +382,9 @@ # define __glibc_likely(cond) (cond) #endif -#if !defined _Noreturn && __STDC_VERSION__ < 201112 && !__GNUC_PREREQ (4,7) +#if (!defined _Noreturn \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ + && !__GNUC_PREREQ (4,7)) # if __GNUC_PREREQ (2,8) # define _Noreturn __attribute__ ((__noreturn__)) # else -- cgit v1.2.3