Merge commit 'ff7aeceb6b3a476c3bac66a7f39a5ef4240206fc' [#247, #906]

21 files changed, 123 insertions, 48 deletions

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index cc50245..bdc222b 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,78 @@
+2022-01-17  Martin Liska  <mliska@suse.cz>
+
+	* Makefile.in: Rename .c names to .cc.
+
+2022-01-17  Martin Liska  <mliska@suse.cz>
+
+	* Makefile.in: Rename .c names to .cc.
+	* charset.cc (convert_escape): Likewise.
+	* directives.cc (directive_diagnostics): Likewise.
+	(_cpp_handle_directive): Likewise.
+	(lex_macro_node): Likewise.
+	* include/cpplib.h (struct _cpp_file): Likewise.
+	(PURE_ZERO): Likewise.
+	(cpp_defined): Likewise.
+	(cpp_error_at): Likewise.
+	(cpp_forall_identifiers): Likewise.
+	(cpp_compare_macros): Likewise.
+	(cpp_get_converted_source): Likewise.
+	(cpp_read_state): Likewise.
+	(cpp_directive_only_process): Likewise.
+	(struct cpp_decoded_char): Likewise.
+	* include/line-map.h (enum lc_reason): Likewise.
+	(enum location_aspect): Likewise.
+	* include/mkdeps.h: Likewise.
+	* init.cc (cpp_destroy): Likewise.
+	(cpp_finish): Likewise.
+	* internal.h (struct cpp_reader): Likewise.
+	(_cpp_defined_macro_p): Likewise.
+	(_cpp_backup_tokens_direct): Likewise.
+	(_cpp_destroy_hashtable): Likewise.
+	(_cpp_has_header): Likewise.
+	(_cpp_expand_op_stack): Likewise.
+	(_cpp_commit_buff): Likewise.
+	(_cpp_restore_special_builtin): Likewise.
+	(_cpp_bracket_include): Likewise.
+	(_cpp_replacement_text_len): Likewise.
+	(ufputs): Likewise.
+	* line-map.cc (linemap_macro_loc_to_exp_point): Likewise.
+	(linemap_check_files_exited): Likewise.
+	(line_map_new_raw): Likewise.
+	* traditional.cc (enum ls): Likewise.
+
+2022-01-17  Martin Liska  <mliska@suse.cz>
+
+	* charset.c: Moved to...
+	* charset.cc: ...here.
+	* directives.c: Moved to...
+	* directives.cc: ...here.
+	* errors.c: Moved to...
+	* errors.cc: ...here.
+	* expr.c: Moved to...
+	* expr.cc: ...here.
+	* files.c: Moved to...
+	* files.cc: ...here.
+	* identifiers.c: Moved to...
+	* identifiers.cc: ...here.
+	* init.c: Moved to...
+	* init.cc: ...here.
+	* lex.c: Moved to...
+	* lex.cc: ...here.
+	* line-map.c: Moved to...
+	* line-map.cc: ...here.
+	* macro.c: Moved to...
+	* macro.cc: ...here.
+	* makeucnid.c: Moved to...
+	* makeucnid.cc: ...here.
+	* mkdeps.c: Moved to...
+	* mkdeps.cc: ...here.
+	* pch.c: Moved to...
+	* pch.cc: ...here.
+	* symtab.c: Moved to...
+	* symtab.cc: ...here.
+	* traditional.c: Moved to...
+	* traditional.cc: ...here.
+
 2022-01-15  Martin Sebor  <msebor@redhat.com>
 
 	* files.c (_cpp_find_file): Substitute a valid pointer for
diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 90d29da..9e4c3fe 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -89,14 +89,14 @@ libcpp_a_OBJS = charset.o directives.o errors.o \
 	expr.o files.o identifiers.o init.o lex.o line-map.o macro.o \
 	mkdeps.o pch.o symtab.o traditional.o
 
-libcpp_a_SOURCES = charset.c directives.c errors.c \
-	expr.c files.c identifiers.c init.c lex.c line-map.c macro.c \
-	mkdeps.c pch.c symtab.c traditional.c
+libcpp_a_SOURCES = charset.cc directives.cc errors.cc \
+	expr.cc files.cc identifiers.cc init.cc lex.cc line-map.cc macro.cc \
+	mkdeps.cc pch.cc symtab.cc traditional.cc
 
 all: libcpp.a $(USED_CATALOGS)
 
 .SUFFIXES:
-.SUFFIXES: .c .gmo .o .obj .po .pox
+.SUFFIXES: .cc .gmo .o .obj .po .pox
 
 libcpp.a: $(libcpp_a_OBJS)
 	-rm -f libcpp.a
@@ -223,7 +223,7 @@ endif
 
 # Implicit rules and I18N
 
-.c.o:
+.cc.o:
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
diff --git a/libcpp/charset.c b/libcpp/charset.cc
index b306f5d..ca8b7cf 100644
--- a/libcpp/charset.c
+++ b/libcpp/charset.cc
@@ -1,7 +1,7 @@
 /* CPP Library - charsets
    Copyright (C) 1998-2022 Free Software Foundation, Inc.
 
-   Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges.
+   Broken out of c-lex.cc Apr 2003, adding valid C99 UCN ranges.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -1581,7 +1581,7 @@ convert_escape (cpp_reader *pfile, const uchar *from, const uchar *limit,
 	{
 	  encoding_rich_location rich_loc (pfile);
 
-	  /* diagnostic.c does not support "%03o".  When it does, this
+	  /* diagnostic.cc does not support "%03o".  When it does, this
 	     code can use %03o directly in the diagnostic again.  */
 	  char buf[32];
 	  sprintf(buf, "%03o", (int) c);
diff --git a/libcpp/directives.c b/libcpp/directives.cc
index 3bee192..60fd274 100644
--- a/libcpp/directives.c
+++ b/libcpp/directives.cc
@@ -416,7 +416,7 @@ directive_diagnostics (cpp_reader *pfile, const directive *dir, int indented)
 
 /* Check if we have a known directive.  INDENTED is true if the
    '#' of the directive was indented.  This function is in this file
-   to save unnecessarily exporting dtable etc. to lex.c.  Returns
+   to save unnecessarily exporting dtable etc. to lex.cc.  Returns
    nonzero if the line of tokens has been handled, zero if we should
    continue processing the line.  */
 int
@@ -480,7 +480,7 @@ _cpp_handle_directive (cpp_reader *pfile, bool indented)
 
 	 does not cause '#define foo bar' to get executed when
 	 compiled with -save-temps, we recognize directives in
-	 -fpreprocessed mode only if the # is in column 1.  macro.c
+	 -fpreprocessed mode only if the # is in column 1.  macro.cc
 	 puts a space in front of any '#' at the start of a macro.
 	 
 	 We exclude the -fdirectives-only case because macro expansion
@@ -632,7 +632,7 @@ lex_macro_node (cpp_reader *pfile, bool is_def_or_undef)
   return NULL;
 }
 
-/* Process a #define directive.  Most work is done in macro.c.  */
+/* Process a #define directive.  Most work is done in macro.cc.  */
 static void
 do_define (cpp_reader *pfile)
 {
diff --git a/libcpp/errors.c b/libcpp/errors.cc
index df5f8d6..df5f8d6 100644
--- a/libcpp/errors.c
+++ b/libcpp/errors.cc
diff --git a/libcpp/expr.c b/libcpp/expr.cc
index 78c5c3e..78c5c3e 100644
--- a/libcpp/expr.c
+++ b/libcpp/expr.cc
diff --git a/libcpp/files.c b/libcpp/files.cc
index 24208f7..24208f7 100644
--- a/libcpp/files.c
+++ b/libcpp/files.cc
diff --git a/libcpp/identifiers.c b/libcpp/identifiers.cc
index 835a971..835a971 100644
--- a/libcpp/identifiers.c
+++ b/libcpp/identifiers.cc
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index ebf6fcc..940c79f 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -46,7 +46,7 @@ struct _cpp_file;
    '='.  The lexer needs operators ending in '=', like ">>=", to be in
    the same order as their counterparts without the '=', like ">>".
 
-   See the cpp_operator table optab in expr.c if you change the order or
+   See the cpp_operator table optab in expr.cc if you change the order or
    add or remove anything in the first group.  */
 
 #define TTYPE_TABLE							\
@@ -192,7 +192,7 @@ struct GTY(()) cpp_string {
 				     comment.  */
 #define BOL		(1 << 6) /* Token at beginning of line.  */
 #define PURE_ZERO	(1 << 7) /* Single 0 digit, used by the C++ frontend,
-				    set in c-lex.c.  */
+				    set in c-lex.cc.  */
 #define SP_DIGRAPH	(1 << 8) /* # or ## token was a digraph.  */
 #define SP_PREV_WHITE	(1 << 9) /* If whitespace before a ##
 				    operator, or before this token
@@ -1195,7 +1195,7 @@ extern int cpp_defined (cpp_reader *, const unsigned char *, int);
    the double integer are set to zero.  */
 
 /* This type has to be equal to unsigned HOST_WIDE_INT, see
-   gcc/c-family/c-lex.c.  */
+   gcc/c-family/c-lex.cc.  */
 typedef uint64_t cpp_num_part;
 typedef struct cpp_num cpp_num;
 struct cpp_num
@@ -1333,7 +1333,7 @@ extern bool cpp_error_at (cpp_reader * pfile, enum cpp_diagnostic_level,
 			  rich_location *richloc, const char *msgid, ...)
   ATTRIBUTE_PRINTF_4;
 
-/* In lex.c */
+/* In lex.cc */
 extern int cpp_ideq (const cpp_token *, const char *);
 extern void cpp_output_line (cpp_reader *, FILE *);
 extern unsigned char *cpp_output_line_to_string (cpp_reader *,
@@ -1390,7 +1390,7 @@ extern cpp_hashnode *cpp_lookup (cpp_reader *, const unsigned char *,
 typedef int (*cpp_cb) (cpp_reader *, cpp_hashnode *, void *);
 extern void cpp_forall_identifiers (cpp_reader *, cpp_cb, void *);
 
-/* In macro.c */
+/* In macro.cc */
 extern void cpp_scan_nooutput (cpp_reader *);
 extern int  cpp_sys_macro_p (cpp_reader *);
 extern unsigned char *cpp_quote_string (unsigned char *, const unsigned char *,
@@ -1398,7 +1398,7 @@ extern unsigned char *cpp_quote_string (unsigned char *, const unsigned char *,
 extern bool cpp_compare_macros (const cpp_macro *macro1,
 				const cpp_macro *macro2);
 
-/* In files.c */
+/* In files.cc */
 extern bool cpp_included (cpp_reader *, const char *);
 extern bool cpp_included_before (cpp_reader *, const char *, location_t);
 extern void cpp_make_system_header (cpp_reader *, int, int);
@@ -1426,7 +1426,7 @@ struct cpp_converted_source
 cpp_converted_source cpp_get_converted_source (const char *fname,
 					       const char *input_charset);
 
-/* In pch.c */
+/* In pch.cc */
 struct save_macro_data;
 extern int cpp_save_state (cpp_reader *, FILE *);
 extern int cpp_write_pch_deps (cpp_reader *, FILE *);
@@ -1436,7 +1436,7 @@ extern void cpp_prepare_state (cpp_reader *, struct save_macro_data **);
 extern int cpp_read_state (cpp_reader *, const char *, FILE *,
 			   struct save_macro_data *);
 
-/* In lex.c */
+/* In lex.cc */
 extern void cpp_force_token_locations (cpp_reader *, location_t);
 extern void cpp_stop_forcing_token_locations (cpp_reader *);
 enum CPP_DO_task
@@ -1452,7 +1452,7 @@ extern void cpp_directive_only_process (cpp_reader *pfile,
 						    CPP_DO_task,
 						    void *data, ...));
 
-/* In expr.c */
+/* In expr.cc */
 extern enum cpp_ttype cpp_userdef_string_remove_type
   (enum cpp_ttype type);
 extern enum cpp_ttype cpp_userdef_string_add_type
@@ -1468,7 +1468,7 @@ extern bool cpp_userdef_char_p
 extern const char * cpp_get_userdef_suffix
   (const cpp_token *);
 
-/* In charset.c */
+/* In charset.cc */
 
 /* The result of attempting to decode a run of UTF-8 bytes.  */
 
@@ -1486,7 +1486,7 @@ struct cpp_decoded_char
    This is a tabstop value, along with a callback for getting the
    widths of characters.  Normally this callback is cpp_wcwidth, but we
    support other schemes for escaping non-ASCII unicode as a series of
-   ASCII chars when printing the user's source code in diagnostic-show-locus.c
+   ASCII chars when printing the user's source code in diagnostic-show-locus.cc
 
    For example, consider:
    - the Unicode character U+03C0 "GREEK SMALL LETTER PI" (UTF-8: 0xCF 0x80)
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index 3053ec0..3f39eb4 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -83,7 +83,7 @@ enum lc_reason
 
    This key only has meaning in relation to a line_maps instance.  Within
    gcc there is a single line_maps instance: "line_table", declared in
-   gcc/input.h and defined in gcc/input.c.
+   gcc/input.h and defined in gcc/input.cc.
 
    The values of the keys are intended to be internal to libcpp,
    but for ease-of-understanding the implementation, they are currently
@@ -2106,8 +2106,8 @@ enum location_aspect
 
 /* The rich_location class requires a way to expand location_t instances.
    We would directly use expand_location_to_spelling_point, which is
-   implemented in gcc/input.c, but we also need to use it for rich_location
-   within genmatch.c.
+   implemented in gcc/input.cc, but we also need to use it for rich_location
+   within genmatch.cc.
    Hence we require client code of libcpp to implement the following
    symbol.  */
 extern expanded_location
diff --git a/libcpp/include/mkdeps.h b/libcpp/include/mkdeps.h
index e8a633c..96d6464 100644
--- a/libcpp/include/mkdeps.h
+++ b/libcpp/include/mkdeps.h
@@ -25,7 +25,7 @@ along with this program; see the file COPYING3.  If not see
 
 #include "cpplib.h"
 
-/* This is the data structure used by all the functions in mkdeps.c.
+/* This is the data structure used by all the functions in mkdeps.cc.
    It's quite straightforward, but should be treated as opaque.  */
 
 class mkdeps;
diff --git a/libcpp/init.c b/libcpp/init.cc
index 2a1a001..f4ab83d 100644
--- a/libcpp/init.c
+++ b/libcpp/init.cc
@@ -382,7 +382,7 @@ cpp_destroy (cpp_reader *pfile)
 
    There are two tables of these.  builtin_array holds all the
    "builtin" macros: these are handled by builtin_macro() in
-   macro.c.  Builtin is somewhat of a misnomer -- the property of
+   macro.cc.  Builtin is somewhat of a misnomer -- the property of
    interest is that these macros require special code to compute their
    expansions.  The value is a "cpp_builtin_type" enumerator.
 
@@ -412,7 +412,7 @@ static const struct builtin_macro builtin_array[] =
   B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true),
   B("__COUNTER__",	 BT_COUNTER,       true),
   /* Make sure to update the list of built-in
-     function-like macros in traditional.c:
+     function-like macros in traditional.cc:
      fun_like_macro() when adding more following */
   B("__has_attribute",	 BT_HAS_ATTRIBUTE, true),
   B("__has_c_attribute", BT_HAS_STD_ATTRIBUTE, true),
@@ -848,7 +848,7 @@ cpp_finish (cpp_reader *pfile, FILE *deps_stream)
   if (CPP_OPTION (pfile, warn_unused_macros))
     cpp_forall_identifiers (pfile, _cpp_warn_if_unused_macro, NULL);
 
-  /* lex.c leaves the final buffer on the stack.  This it so that
+  /* lex.cc leaves the final buffer on the stack.  This it so that
      it returns an unending stream of CPP_EOFs to the client.  If we
      popped the buffer, we'd dereference a NULL buffer pointer and
      segfault.  It's nice to allow the client to do worry-free excess
diff --git a/libcpp/internal.h b/libcpp/internal.h
index e49b6d1..364c41c 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -534,15 +534,15 @@ struct cpp_reader
   cpp_token avoid_paste;
   cpp_token endarg;
 
-  /* Opaque handle to the dependencies of mkdeps.c.  */
+  /* Opaque handle to the dependencies of mkdeps.cc.  */
   class mkdeps *deps;
 
   /* Obstack holding all macro hash nodes.  This never shrinks.
-     See identifiers.c */
+     See identifiers.cc */
   struct obstack hash_ob;
 
   /* Obstack holding buffer and conditional structures.  This is a
-     real stack.  See directives.c.  */
+     real stack.  See directives.cc.  */
   struct obstack buffer_ob;
 
   /* Pragma table - dynamic, because a library user can add to the
@@ -577,7 +577,7 @@ struct cpp_reader
     location_t first_line;
   } out;
 
-  /* Used for buffer overlays by traditional.c.  */
+  /* Used for buffer overlays by traditional.cc.  */
   const unsigned char *saved_cur, *saved_rlimit, *saved_line_base;
 
   /* A saved list of the defined macros, for dependency checking
@@ -614,7 +614,7 @@ struct cpp_reader
    definition of a pp-number in the C standard [section 6.4.8 of C99].
 
    In the unlikely event that characters other than \r and \n enter
-   the set is_vspace, the macro handle_newline() in lex.c must be
+   the set is_vspace, the macro handle_newline() in lex.cc must be
    updated.  */
 #define _dollar_ok(x)	((x) == '$' && CPP_OPTION (pfile, dollars_in_ident))
 
@@ -673,7 +673,7 @@ inline bool _cpp_defined_macro_p (cpp_hashnode *node)
   return cpp_macro_p (node) && !(node->flags & NODE_CONDITIONAL);
 }
 
-/* In macro.c */
+/* In macro.cc */
 extern bool _cpp_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node,
 				   location_t);
 inline bool _cpp_maybe_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node,
@@ -702,11 +702,11 @@ extern void _cpp_push_token_context (cpp_reader *, cpp_hashnode *,
 				     const cpp_token *, unsigned int);
 extern void _cpp_backup_tokens_direct (cpp_reader *, unsigned int);
 
-/* In identifiers.c */
+/* In identifiers.cc */
 extern void _cpp_init_hashtable (cpp_reader *, cpp_hash_table *);
 extern void _cpp_destroy_hashtable (cpp_reader *);
 
-/* In files.c */
+/* In files.cc */
 enum _cpp_find_file_kind
   { _cpp_FFK_NORMAL, _cpp_FFK_FAKE, _cpp_FFK_PRE_INCLUDE, _cpp_FFK_HAS_INCLUDE };
 extern _cpp_file *_cpp_find_file (cpp_reader *, const char *, cpp_dir *,
@@ -732,11 +732,11 @@ extern struct stat *_cpp_get_file_stat (_cpp_file *);
 extern bool _cpp_has_header (cpp_reader *, const char *, int,
 			     enum include_type);
 
-/* In expr.c */
+/* In expr.cc */
 extern bool _cpp_parse_expr (cpp_reader *, bool);
 extern struct op *_cpp_expand_op_stack (cpp_reader *);
 
-/* In lex.c */
+/* In lex.cc */
 extern void _cpp_process_line_notes (cpp_reader *, int);
 extern void _cpp_clean_line (cpp_reader *);
 extern bool _cpp_get_fresh_line (cpp_reader *);
@@ -759,13 +759,13 @@ static inline void *_cpp_reserve_room (cpp_reader *pfile, size_t have,
 }
 extern void *_cpp_commit_buff (cpp_reader *pfile, size_t size);
 
-/* In init.c.  */
+/* In init.cc.  */
 extern void _cpp_maybe_push_include_file (cpp_reader *);
 extern const char *cpp_named_operator2name (enum cpp_ttype type);
 extern void _cpp_restore_special_builtin (cpp_reader *pfile,
 					  struct def_pragma_macro *);
 
-/* In directives.c */
+/* In directives.cc */
 extern int _cpp_test_assertion (cpp_reader *, unsigned int *);
 extern int _cpp_handle_directive (cpp_reader *, bool);
 extern void _cpp_define_builtin (cpp_reader *, const char *);
@@ -779,10 +779,10 @@ extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *,
 extern void _cpp_pop_buffer (cpp_reader *);
 extern char *_cpp_bracket_include (cpp_reader *);
 
-/* In errors.c  */
+/* In errors.cc  */
 extern location_t cpp_diagnostic_get_current_location (cpp_reader *);
 
-/* In traditional.c.  */
+/* In traditional.cc.  */
 extern bool _cpp_scan_out_logical_line (cpp_reader *, cpp_macro *, bool);
 extern bool _cpp_read_logical_line_trad (cpp_reader *);
 extern void _cpp_overlay_buffer (cpp_reader *pfile, const unsigned char *,
@@ -795,7 +795,7 @@ extern unsigned char *_cpp_copy_replacement_text (const cpp_macro *,
 						  unsigned char *);
 extern size_t _cpp_replacement_text_len (const cpp_macro *);
 
-/* In charset.c.  */
+/* In charset.cc.  */
 
 /* The normalization state at this point in the sequence.
    It starts initialized to all zeros, and at the end
@@ -900,7 +900,7 @@ ufputs (const unsigned char *s, FILE *f)
   return fputs ((const char *)s, f);
 }
 
-/* In line-map.c.  */
+/* In line-map.cc.  */
 
 /* Create and return a virtual location for a token that is part of a
    macro expansion-list at a macro expansion point.  See the comment
diff --git a/libcpp/lex.c b/libcpp/lex.cc
index 4d73657..4d73657 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.cc
diff --git a/libcpp/line-map.c b/libcpp/line-map.cc
index 91ac2d3..b18cb67 100644
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.cc
@@ -44,7 +44,7 @@ static location_t linemap_macro_loc_to_exp_point (line_maps *,
 						  location_t,
 						  const line_map_ordinary **);
 
-/* Counters defined in macro.c.  */
+/* Counters defined in macro.cc.  */
 extern unsigned num_expanded_macros_counter;
 extern unsigned num_macro_tokens_counter;
 
@@ -374,7 +374,7 @@ linemap_check_files_exited (line_maps *set)
   for (const line_map_ordinary *map = LINEMAPS_LAST_ORDINARY_MAP (set);
        ! MAIN_FILE_P (map);
        map = linemap_included_from_linemap (set, map))
-    fprintf (stderr, "line-map.c: file \"%s\" entered but not left\n",
+    fprintf (stderr, "line-map.cc: file \"%s\" entered but not left\n",
 	     ORDINARY_MAP_FILE_NAME (map));
 }
 
@@ -410,7 +410,7 @@ line_map_new_raw (line_maps *set, bool macro_p, unsigned num)
 
       /* We are going to execute some dance to try to reduce the
 	 overhead of the memory allocator, in case we are using the
-	 ggc-page.c one.
+	 ggc-page.cc one.
 	 
 	 The actual size of memory we are going to get back from the
 	 allocator may well be larger than what we ask for.  Use this
diff --git a/libcpp/macro.c b/libcpp/macro.cc
index 65b7a1c..65b7a1c 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.cc
diff --git a/libcpp/makeucnid.c b/libcpp/makeucnid.cc
index 57c3beb..57c3beb 100644
--- a/libcpp/makeucnid.c
+++ b/libcpp/makeucnid.cc
diff --git a/libcpp/mkdeps.c b/libcpp/mkdeps.cc
index 30e87d8..30e87d8 100644
--- a/libcpp/mkdeps.c
+++ b/libcpp/mkdeps.cc
diff --git a/libcpp/pch.c b/libcpp/pch.cc
index 9aa589a..9aa589a 100644
--- a/libcpp/pch.c
+++ b/libcpp/pch.cc
diff --git a/libcpp/symtab.c b/libcpp/symtab.cc
index a059214..a059214 100644
--- a/libcpp/symtab.c
+++ b/libcpp/symtab.cc
diff --git a/libcpp/traditional.c b/libcpp/traditional.cc
index 1ce93a6..d02ea48 100644
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.cc
@@ -80,7 +80,7 @@ enum ls {ls_none = 0,		/* Normal state.  */
 	 ls_answer		/* In answer to predicate.  */
 };
 
-/* Lexing TODO: Maybe handle space in escaped newlines.  Stop lex.c
+/* Lexing TODO: Maybe handle space in escaped newlines.  Stop lex.cc
    from recognizing comments and directives during its lexing pass.  */
 
 static const uchar *skip_whitespace (cpp_reader *, const uchar *, int);