From: DJ Delorie <dj@redhat.com>
Date: Sat, 30 Oct 2010 00:01:15 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: binutils-2_21-branchpoint~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80347f88a2e87534cf0123e9f87d069e96ceba36;p=external%2Fbinutils.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8585db5..3d00793 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-29  Ian Lance Taylor  <iant@google.com>
+
+	* setproctitle.c: Add space after function name in @deftypefn
+	comment.
+	* functions.texi: Rebuild.
+
 2010-10-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* aclocal.m4 (AC_LANG_FUNC_LINK_TRY(C)): Delete.
diff --git a/libiberty/functions.texi b/libiberty/functions.texi
index e074ba7..af8c4bf 100644
--- a/libiberty/functions.texi
+++ b/libiberty/functions.texi
@@ -1147,7 +1147,7 @@ environment.  This implementation is not safe for multithreaded code.
 @end deftypefn
 
 @c setproctitle.c:30
-@deftypefn Supplemental void setproctitle(const char *@var{fmt} ...)
+@deftypefn Supplemental void setproctitle (const char *@var{fmt} ...)
 
 Set the title of a process to @var{fmt}. va args not supported for now,
 but defined for compatibility with BSD. 
diff --git a/libiberty/setproctitle.c b/libiberty/setproctitle.c
index b176b41..734af2e 100644
--- a/libiberty/setproctitle.c
+++ b/libiberty/setproctitle.c
@@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA.  */
 
 /*
 
-@deftypefn Supplemental void setproctitle(const char *@var{fmt} ...)
+@deftypefn Supplemental void setproctitle (const char *@var{fmt} ...)
 
 Set the title of a process to @var{fmt}. va args not supported for now,
 but defined for compatibility with BSD.