merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index dc5492c..9881787 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-29  Ian Lance Taylor  <ian@airs.com>
+
+       * libiberty.h: Fix indentation.
+
 2005-03-28  Ian Lance Taylor  <ian@airs.com>
 
        * libiberty.h: Include <stdio.h>.

diff --git a/include/libiberty.h b/include/libiberty.h
index 1bdf0ce..eb5633b 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -454,7 +454,7 @@ extern int pex_get_times (struct pex_obj *, int count,
 
 /* Clean up a pex_obj.  */
 
-  extern void pex_free (struct pex_obj *);
+extern void pex_free (struct pex_obj *);
 
 /* Just execute one program.  Return value is as for pex_run.
    FLAGS       Combination of PEX_SEARCH and PEX_STDERR_TO_STDOUT.