From: DJ Delorie <dj@redhat.com>
Date: Thu, 31 Mar 2005 17:03:35 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e867e795772266c7c4f360f0e0ef4c9f9c2c93a;p=binutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 412a4aaa5d8..d4bc04aa6fb 100644
--- 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 a886b885704..75f98243a02 100644
--- 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 a7f7836d24e..fca16794028 100644
--- 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.