* c-decl.c: Follow spelling conventions.

	* cppfiles.c: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70578 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37f746e2485403e6d3f552b2d4be8357729b19ea..b2a0ba10d1e7240d73e5cf5949a03e0a07357cd4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * c-decl.c: Follow spelling conventions.
+       * cppfiles.c: Likewise.
+
 2003-08-19  Kazu Hirata  <kazu@cs.umass.edu>
 
        * c-common.c: Fix comment formatting.

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index feef9900145f5d3949ba4d89d739416a60830271..33df3524fdec2ea66ce5a84de8ff424c601f8124 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -6764,7 +6764,7 @@ merge_translation_unit_decls (void)
              tree old_decl = (tree) *slot;
 
              /* If this is weak or common or whatever, suppress it
-                in favour of the other definition.  */
+                in favor of the other definition.  */
              if (DECL_WEAK (decl))
                DECL_EXTERNAL (decl) = 1;
              else if (DECL_WEAK (old_decl) && ! DECL_WEAK (decl))

diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 22e95248cc28e2d9921b3c79e6b13d698a206dcd..c0aaa5cf0abaaf56b75649db9570ec6bf4882ca9 100644 (file)
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -334,7 +334,7 @@ find_file_in_dir (cpp_reader *pfile, _cpp_file *file)
    add the result to our cache.
 
    If the file was not found in the filesystem, or there was an error
-   opening it, then ERR_NO is non-zero and FD is -1.  If the file was
+   opening it, then ERR_NO is nonzero and FD is -1.  If the file was
    found, then ERR_NO is zero and FD could be -1 or an open file
    descriptor.  FD can be -1 if the file was found in the cache and
    had previously been closed.  To open it again pass the return value
@@ -675,7 +675,7 @@ search_path_head (cpp_reader *pfile, const char *fname, int angle_brackets,
 }
 
 /* Strip the basename from the file's path.  It ends with a slash if
-   of non-zero length.  Note that this procedure also works for
+   of nonzero length.  Note that this procedure also works for
    <stdin>, which is represented by the empty string.  */
 static const char *
 dir_name_of_file (_cpp_file *file)