From f64acab6abe8755d8939fbcebc305c2af10692a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Coudert?= <fxcoudert@gcc.gnu.org>
Date: Sun, 21 Jan 2007 21:04:53 +0000
Subject: [PATCH] * runtime/error.c: Include sys/time.h before sys/resource.h.

From-SVN: r121036
---
 libgfortran/ChangeLog       |  6 +++++-
 libgfortran/runtime/error.c | 10 ++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index f12f83ee441..d432812fe59 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,10 +1,14 @@
+2007-01-21  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	* runtime/error.c: Include sys/time.h before sys/resource.h.
+
 2007-01-21  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR libfortran/30525
 	* intrinsics/string_intrinsics.c(compare_string):  Make
 	sure that comparisons are done unsigned.
 
-2006-12-09  Tobias Burnus  <burnus@net-b.de>
+2007-01-21  Tobias Burnus  <burnus@net-b.de>
 
 	PR libfortran/30015
 	* intrinsics/date_and_time.c (date_and_time): Fix case where time
diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index e6713d2cc4d..afd6a217269 100644
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -48,14 +48,16 @@ Boston, MA 02110-1301, USA.  */
 #include <stdlib.h>
 #endif
 
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
+/* <sys/time.h> has to be included before <sys/resource.h> to work
+   around PR 30518; otherwise, MacOS 10.3.9 headers are just broken.  */
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
 #include "libgfortran.h"
 
 #ifdef __MINGW32__