aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazu Hirata <kazu@cs.umass.edu>2003-08-19 21:09:36 +0000
committerKazu Hirata <kazu@gcc.gnu.org>2003-08-19 21:09:36 +0000
commit02fa63cdf7a020cc47eb33f3d030fc77bc24a07a (patch)
treebb68dcb42d0505b180935f97feb4e5e9db8ba075
parent59e4e217ae04230110961dfa6e0d7905189e7edc (diff)
downloadgcc-02fa63cdf7a020cc47eb33f3d030fc77bc24a07a.zip
gcc-02fa63cdf7a020cc47eb33f3d030fc77bc24a07a.tar.gz
gcc-02fa63cdf7a020cc47eb33f3d030fc77bc24a07a.tar.bz2
c-decl.c: Follow spelling conventions.
* c-decl.c: Follow spelling conventions. * cppfiles.c: Likewise. From-SVN: r70578
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-decl.c2
-rw-r--r--gcc/cppfiles.c4
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37f746e..b2a0ba1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
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.
* c-common.h: Likewise.
* c-decl.c: Likewise.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index feef990..33df352 100644
--- 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 22e9524..c0aaa5c 100644
--- 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)