merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index d45c62a..b659971 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-09  Mark Mitchell  <mark@codesourcery.com>
+
+       * libiberty.h (gettimeofday): Declare.
+
 2005-03-01  Jan Beulich  <jbeulich@novell.com>
 
        * libiberty.h: Declare unlink_if_ordinary.

diff --git a/include/libiberty.h b/include/libiberty.h
index 4df8140..0814695 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -145,6 +145,15 @@ extern int fdmatch PARAMS ((int fd1, int fd2));
 
 extern char * getpwd PARAMS ((void));
 
+/* Get the current time.  */
+/* Prototypes vary from system to system, so we only provide a
+   prototype on systems where we know that we need it.  */
+#ifdef __MINGW32__
+/* Forward declaration to avoid #include <sys/time.h>.   */
+struct timeval;
+extern int gettimeofday PARAMS ((struct timeval *, void *)); 
+#endif
+
 /* Get the amount of time the process has run, in microseconds.  */
 
 extern long get_run_time PARAMS ((void));