From: dj <dj>
Date: Wed, 25 Oct 2006 01:42:44 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: drop_9x_support_start~1330
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=afb97815b3904120757ea64fb8a065286737175c;p=pf3gnuchains%2Fpf3gnuchains4x.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ada1d12a06..30e4122de9 100644
--- 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 d85ee59b00..0310d8f085 100644
--- 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