diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-07-23 16:28:30 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-07-23 16:28:30 +0000 |
| commit | aa622474f8690a7cbb6b15bcda08e744a0893d1d (patch) | |
| tree | ee275a09ddc4a4c9076ebf8deb8c7fc73bd556fa /gcc | |
| parent | f8cb9479d4a5548ba9bbd8f9ab70d01f727e88d3 (diff) | |
| download | gcc-aa622474f8690a7cbb6b15bcda08e744a0893d1d.tar.gz | |
* c-lex.c (init_lex): Keep the "inline" keyword in C99 mode.
(yylex): Don't pedwarn for "inline" in C99 mode.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35202 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/c-lex.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4aeca1eed90..4b289373d36 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2000-07-23 Joseph S. Myers <jsm28@cam.ac.uk> + * c-lex.c (init_lex): Keep the "inline" keyword in C99 mode. + (yylex): Don't pedwarn for "inline" in C99 mode. + * bitmap.c (debug_bitmap_file): Cast pointers to PTR for printing with %p. * ggc-page.c (debug_print_page_list, alloc_page, free_page, diff --git a/gcc/c-lex.c b/gcc/c-lex.c index fe1d03f4420..9ceb2bfcc62 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -338,7 +338,8 @@ init_lex () { UNSET_RESERVED_WORD ("asm"); UNSET_RESERVED_WORD ("typeof"); - UNSET_RESERVED_WORD ("inline"); + if (! flag_isoc99) + UNSET_RESERVED_WORD ("inline"); UNSET_RESERVED_WORD ("iterator"); UNSET_RESERVED_WORD ("complex"); } @@ -1402,7 +1403,7 @@ yylex () /* Even if we decided to recognize asm, still perhaps warn. */ if (pedantic && (value == ASM_KEYWORD || value == TYPEOF - || ptr->rid == RID_INLINE) + || (ptr->rid == RID_INLINE && ! flag_isoc99)) && token_buffer[0] != '_') pedwarn ("ANSI does not permit the keyword `%s'", token_buffer); |