diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | misc/sys/cdefs.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 7b336046bf..049de91757 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-02 Roland McGrath <roland@hack.frob.com> + + * misc/sys/cdefs.h: Check if __STDC_VERSION__ is defined + before checking its value. + 2014-07-02 Siddhesh Poyarekar <siddhesh@redhat.com> * 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 |