merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ada1d12a0690097aadfb22790eee46d152a68dc0..30e4122de975b1d6e16ad64f5714f6989e211353 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-25  Ben Elliston  <bje@au.ibm.com>
+
+       * pexecute.txh: Wrap pexecute's "flag" argument with @var {..}.
+       
 2006-10-10  Brooks Moses  <bmoses@stanford.edu>
 
        * Makefile.in: Added "pdf", "libiberty.pdf" target support.

diff --git a/libiberty/pexecute.txh b/libiberty/pexecute.txh
index d85ee59b0081aca61dc8ecc3f3f07aad01d2077f..0310d8f0858e2db8d159fe0d70c8e0ea7218092b 100644 (file)
--- a/libiberty/pexecute.txh
+++ b/libiberty/pexecute.txh
@@ -259,7 +259,7 @@ be set to the exit status of the program.
 
 @end deftypefn
 
-@deftypefn Extension int pexecute (const char *@var{program}, char * const *@var{argv}, const char *@var{this_pname}, const char *@var{temp_base}, char **@var{errmsg_fmt}, char **@var{errmsg_arg}, int flags)
+@deftypefn Extension int pexecute (const char *@var{program}, char * const *@var{argv}, const char *@var{this_pname}, const char *@var{temp_base}, char **@var{errmsg_fmt}, char **@var{errmsg_arg}, int @var{flags})
 
 This is the old interface to execute one or more programs.  It is
 still supported for compatibility purposes, but is no longer