diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2006-01-23 22:50:15 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2006-01-23 22:50:15 +0100 |
| commit | 839009978ae5e2e4f30057e2cdfd925a05c9cc95 (patch) | |
| tree | 426b4cdfa24c0b381ad5f2bef8e8807afd097204 /libcpp/macro.c | |
| parent | 7ebaeab50e26463a6fbe6fe23cffdf69a84bce30 (diff) | |
| download | gcc-839009978ae5e2e4f30057e2cdfd925a05c9cc95.zip gcc-839009978ae5e2e4f30057e2cdfd925a05c9cc95.tar.gz gcc-839009978ae5e2e4f30057e2cdfd925a05c9cc95.tar.bz2 | |
re PR preprocessor/25717 (-dD does not list all defined macros (in particular, __STDC__))
PR preprocessor/25717
* init.c (cpp_init_builtins): If __STDC__ will not change value
between system headers and other sources, define it as a normal
macro rather than a builtin.
* macro.c (_cpp_builtin_macro_text) <case BT_STDC>: Only check
cpp_in_system_header condition.
From-SVN: r110144
Diffstat (limited to 'libcpp/macro.c')
| -rw-r--r-- | libcpp/macro.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libcpp/macro.c b/libcpp/macro.c index 2f1a974..3204e55 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -169,16 +169,12 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) However, if (a) we are in a system header, (b) the option stdc_0_in_system_headers is true (set by target config), and (c) we are not in strictly conforming mode, then it has the - value 0. */ + value 0. (b) and (c) are already checked in cpp_init_builtins. */ case BT_STDC: - { - if (cpp_in_system_header (pfile) - && CPP_OPTION (pfile, stdc_0_in_system_headers) - && !CPP_OPTION (pfile,std)) - number = 0; - else - number = 1; - } + if (cpp_in_system_header (pfile)) + number = 0; + else + number = 1; break; case BT_DATE: |