aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2005-03-31 17:03:35 +0000
committerDJ Delorie <dj@redhat.com>2005-03-31 17:03:35 +0000
commit0e867e795772266c7c4f360f0e0ef4c9f9c2c93a (patch)
treec953bdaa2fa4bf37ab870fbfa7263fd2d5ba32ff
parent4bd60896340febb5bfafc025401ef2d221d748a2 (diff)
downloadgdb-0e867e795772266c7c4f360f0e0ef4c9f9c2c93a.zip
gdb-0e867e795772266c7c4f360f0e0ef4c9f9c2c93a.tar.gz
gdb-0e867e795772266c7c4f360f0e0ef4c9f9c2c93a.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/functions.texi2
-rw-r--r--libiberty/gettimeofday.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 412a4aa..d4bc04a 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 a886b88..75f9824 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 a7f7836..fca1679 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.