From 3a0ab695150fd22a603b028677165f71cb502172 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 6 Sep 2007 17:22:39 +0000 Subject: merge from gcc --- include/ChangeLog | 4 ++++ include/libiberty.h | 5 +++-- libiberty/ChangeLog | 4 ++++ libiberty/pexecute.txh | 4 +++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 3c6743b..9dfb1b0 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2007-09-06 Tom Tromey + + * libiberty.h (pex_free): Document process killing. + 2007-08-31 Douglas Gregor * demangle.h (enum demangle_component_type): Add diff --git a/include/libiberty.h b/include/libiberty.h index 4e69734..6ea8761 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -1,6 +1,6 @@ /* Function declarations for libiberty. - Copyright 2001, 2002, 2005 Free Software Foundation, Inc. + Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc. Note - certain prototypes declared in this header file are for functions whoes implementation copyright does not belong to the @@ -541,7 +541,8 @@ struct pex_time extern int pex_get_times (struct pex_obj *, int count, struct pex_time *vector); -/* Clean up a pex_obj. */ +/* Clean up a pex_obj. If you have not called pex_get_times or + pex_get_status, this will try to kill the subprocesses. */ extern void pex_free (struct pex_obj *); diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 2e43390..781a961 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2007-09-06 Tom Tromey + + * pexecute.txh (pex_free): Document process killing. + 2007-08-31 Douglas Gregor * cp-demangle.c (d_dump): Handle diff --git a/libiberty/pexecute.txh b/libiberty/pexecute.txh index b87c0e5..8baf9a0 100644 --- a/libiberty/pexecute.txh +++ b/libiberty/pexecute.txh @@ -265,7 +265,9 @@ process times, all the fields will be set to @code{0}. @deftypefn Extension void pex_free (struct pex_obj @var{obj}) -Clean up and free all data associated with @var{obj}. +Clean up and free all data associated with @var{obj}. If you have not +yet called @code{pex_get_times} or @code{pex_get_status}, this will +try to kill the subprocesses. @end deftypefn -- cgit v1.1