merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 412a4aa..d4bc04a 100644 (file)
--- 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.

diff --git a/libiberty/functions.texi b/libiberty/functions.texi
index a886b88..75f9824 100644 (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.

diff --git a/libiberty/gettimeofday.c b/libiberty/gettimeofday.c
index a7f7836..fca1679 100644 (file)
--- 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.