merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 412a4aaa5d8c1247cc9e999c3fe5f2a54452ea3f..d4bc04aa6fbcd325ab65f0ecf5c536408f1b1b08 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 a886b8857040cb125e4687106330cb164778f73c..75f98243a0271bb8ca5062f2b5e5a6144b78972b 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 a7f7836d24eec905dd16c95c6d5131001eaa8119..fca16794028e254c48a4341b5455f8658c7a3e23 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.