diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/features.h b/include/features.h index 1189e3ea79..a3e5c142a7 100644 --- a/include/features.h +++ b/include/features.h @@ -23,7 +23,7 @@ to specify the desired environment: __STRICT_ANSI__ ISO Standard C. - _ISOC9X_SOURCE Extensions to ISO C 89 from ISO C 9x. + _ISOC99_SOURCE Extensions to ISO C89 from ISO C99. _POSIX_SOURCE IEEE Std 1003.1. _POSIX_C_SOURCE If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2; if >=199309L, add IEEE Std 1003.1b-1993; @@ -49,7 +49,7 @@ These are defined by this file and are used by the header files to decide what to declare or define: - __USE_ISOC9X Define ISO C 9X things. + __USE_ISOC99 Define ISO C99 things. __USE_POSIX Define IEEE Std 1003.1 things. __USE_POSIX2 Define IEEE Std 1003.2 things. __USE_POSIX199309 Define IEEE Std 1003.1, and .1b things. @@ -79,7 +79,7 @@ /* Undefine everything, so we get a clean slate. */ -#undef __USE_ISOC9X +#undef __USE_ISOC99 #undef __USE_POSIX #undef __USE_POSIX2 #undef __USE_POSIX199309 @@ -118,8 +118,8 @@ /* If _GNU_SOURCE was defined by the user, turn on all the other features. */ #ifdef _GNU_SOURCE -# undef _ISOC9X_SOURCE -# define _ISOC9X_SOURCE 1 +# undef _ISOC99_SOURCE +# define _ISOC99_SOURCE 1 # undef _POSIX_SOURCE # define _POSIX_SOURCE 1 # undef _POSIX_C_SOURCE @@ -138,7 +138,7 @@ /* If nothing (other than _GNU_SOURCE) is defined, define _BSD_SOURCE and _SVID_SOURCE. */ -#if (!defined __STRICT_ANSI__ && !defined _ISOC9X_SOURCE && \ +#if (!defined __STRICT_ANSI__ && !defined _ISOC99_SOURCE && \ !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE && \ !defined _XOPEN_SOURCE && !defined _XOPEN_SOURCE_EXTENDED && \ !defined _BSD_SOURCE && !defined _SVID_SOURCE) @@ -146,10 +146,12 @@ # define _SVID_SOURCE 1 #endif -/* This is to enable the ISO C 9x extension. It will go away as soon - as this standard is officially released. */ -#ifdef _ISOC9X_SOURCE -# define __USE_ISOC9X 1 +/* This is to enable the ISO C99 extension. Also recognize the old macro + which was used prior to the standard acceptance. This macro will + eventually go away and the features enabled by default once the ISO C99 + standard is widely adopted. */ +#if defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE +# define __USE_ISOC99 1 #endif /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 |