merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8585db51634e888764b812ef7a23a26a78975c73..3d00793c9fd558381837680b6af3101d68dc9d0f 100644 (file)
--- 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 e074ba716f8ed2321ab20eab7e3479a1d5ece5d6..af8c4bf6da13b63c2ddb7d269fd0e67121f69139 100644 (file)
--- 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 b176b41f949874417c6118859f3cf37811fbc6d0..734af2eca6e7b31d8aae89d2903a27ef4fab3e97 100644 (file)
--- 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.