merge from gcc

5 files changed, 14 insertions, 8 deletions

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7fba7cbc776..90dcb1f2601 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-10  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* bcmp.c, setenv.c: Use "nonzero" instead of "non-zero".
+	* strtod.c: Use "ISO C" instead of "ANSI C".
+	* functions.texi: Regenerate.
+
 2001-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* alloca.c, clock.c, getcwd.c, getpagesize.c, getpwd.c, index.c,
diff --git a/libiberty/bcmp.c b/libiberty/bcmp.c
index 71bb7ae8ffd..1895773d52d 100644
--- a/libiberty/bcmp.c
+++ b/libiberty/bcmp.c
@@ -6,8 +6,8 @@
 @deftypefn Supplemental int bcmp (char *@var{x}, char *@var{y}, int @var{count})
 
 Compares the first @var{count} bytes of two areas of memory.  Returns
-zero if they are the same, non-zero otherwise.  Returns zero if
-@var{count} is zero.  A non-zero result only indicates a difference,
+zero if they are the same, nonzero otherwise.  Returns zero if
+@var{count} is zero.  A nonzero result only indicates a difference,
 it does not indicate any sorting order (say, by having a positive
 result mean @var{x} sorts before @var{y}).
 
diff --git a/libiberty/functions.texi b/libiberty/functions.texi
index 4ce7e9caa9d..59df233947b 100644
--- a/libiberty/functions.texi
+++ b/libiberty/functions.texi
@@ -40,8 +40,8 @@ Behavior is undefined if the pathname ends in a directory separator.
 @deftypefn Supplemental int bcmp (char *@var{x}, char *@var{y}, int @var{count})
 
 Compares the first @var{count} bytes of two areas of memory.  Returns
-zero if they are the same, non-zero otherwise.  Returns zero if
-@var{count} is zero.  A non-zero result only indicates a difference,
+zero if they are the same, nonzero otherwise.  Returns zero if
+@var{count} is zero.  A nonzero result only indicates a difference,
 it does not indicate any sorting order (say, by having a positive
 result mean @var{x} sorts before @var{y}).
 
@@ -234,7 +234,7 @@ deprecated in new programs in favor of @code{strrchr}.
 
 @code{setenv} adds @var{name} to the environment with value
 @var{value}.  If the name was already present in the environment,
-the new value will be stored only if @var{overwrite} is non-zero.
+the new value will be stored only if @var{overwrite} is nonzero.
 The companion @code{unsetenv} function removes @var{name} from the
 environment.  This implementation is not safe for multithreaded code.
 
@@ -352,7 +352,7 @@ length, the function returns @var{string}.
 @c strtod.c:27
 @deftypefn Supplemental double strtod (const char *@var{string}, char **@var{endptr})
 
-This ANSI C function converts the initial portion of @var{string} to a
+This ISO C function converts the initial portion of @var{string} to a
 @code{double}.  If @var{endptr} is not @code{NULL}, a pointer to the
 character after the last character used in the conversion is stored in
 the location referenced by @var{endptr}.  If no conversion is
diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index dcf84e1106d..79e38ed56b0 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -24,7 +24,7 @@
 
 @code{setenv} adds @var{name} to the environment with value
 @var{value}.  If the name was already present in the environment,
-the new value will be stored only if @var{overwrite} is non-zero.
+the new value will be stored only if @var{overwrite} is nonzero.
 The companion @code{unsetenv} function removes @var{name} from the
 environment.  This implementation is not safe for multithreaded code.
 
diff --git a/libiberty/strtod.c b/libiberty/strtod.c
index 874e5e52416..6b69ccfa8d2 100644
--- a/libiberty/strtod.c
+++ b/libiberty/strtod.c
@@ -26,7 +26,7 @@ the executable file might be covered by the GNU General Public License. */
 
 @deftypefn Supplemental double strtod (const char *@var{string}, char **@var{endptr})
 
-This ANSI C function converts the initial portion of @var{string} to a
+This ISO C function converts the initial portion of @var{string} to a
 @code{double}.  If @var{endptr} is not @code{NULL}, a pointer to the
 character after the last character used in the conversion is stored in
 the location referenced by @var{endptr}.  If no conversion is