c-lex.c (init_lex): Keep the "inline" keyword in C99 mode.

	* c-lex.c (init_lex): Keep the "inline" keyword in C99 mode.
	(yylex): Don't pedwarn for "inline" in C99 mode.

From-SVN: r35202

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4aeca1eed90ac68af773f993769de804cc33b3fa..4b289373d36f706e5dab42ab36e84bbcb802bfe7 100644 (file)
--- 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 fe1d03f44200c239a6dbbb784c473fb9eae9af14..9ceb2bfcc62c50984f38784938ffa94e1cf8b99b 100644 (file)
--- 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);