merge from gcc

22 years ago · 0e867e7957
3 changed files with 7 additions and 2 deletions
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@ -1,3 +1,8 @@
+2005-03-31  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* gettimeofday.c: Add "Supplemental" to @deftypefn.
+	* functions.texi: Regenerate.
+
 2005-03-28  Ian Lance Taylor  <ian@airs.com>

 	* pex-common.c: New file.
--- a/libiberty/functions.texi
+++ b/libiberty/functions.texi
@ -473,7 +473,7 @@ between calls to @code{getpwd}.
@end deftypefn

@c gettimeofday.c:12
-@deftypefn int gettimeofday (struct timeval *@var{tp}, void *@var{tz})
+@deftypefn Supplemental int gettimeofday (struct timeval *@var{tp}, void *@var{tz})

 Writes the current time to @var{tp}.  This implementation requires
 that @var{tz} be NULL.  Returns 0 on success, -1 on failure.
--- a/libiberty/gettimeofday.c
+++ b/libiberty/gettimeofday.c
@ -9,7 +9,7 @@

 /* 

-@deftypefn int gettimeofday (struct timeval *@var{tp}, void *@var{tz})
+@deftypefn Supplemental int gettimeofday (struct timeval *@var{tp}, void *@var{tz})

 Writes the current time to @var{tp}.  This implementation requires
 that @var{tz} be NULL.  Returns 0 on success, -1 on failure.