From 31141c132b0e914551de73972577d3ae30d435dd Mon Sep 17 00:00:00 2001
From: Steven Tamm <steventamm@mac.com>
Date: Sun, 7 Nov 2004 05:57:08 +0000
Subject: editfns.c: Need to include sys/time.h before resource.h on darwin.

---
 src/editfns.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/editfns.c')

diff --git a/src/editfns.c b/src/editfns.c
index 2e8134d4495..bcffc545b6a 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -40,6 +40,9 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #if defined HAVE_SYS_RESOURCE_H
+#ifdef MAC_OSX
+#include <sys/time.h>
+#endif
 #include <sys/resource.h>
 #endif
 
-- 
cgit v1.3


From 21acf124651cdcfd76317649236a25254f57de1b Mon Sep 17 00:00:00 2001
From: Steven Tamm <steventamm@mac.com>
Date: Sun, 7 Nov 2004 05:57:58 +0000
Subject: editfns.c: Adding in better patch

---
 src/editfns.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/editfns.c')

diff --git a/src/editfns.c b/src/editfns.c
index bcffc545b6a..e7a2372e912 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -39,10 +39,11 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #endif
 
-#if defined HAVE_SYS_RESOURCE_H
-#ifdef MAC_OSX
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+
+#if defined HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-- 
cgit v1.3


From 3c14598ca1769373ea8d71a21864f19c93cc5e90 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 8 Nov 2004 12:04:07 +0000
Subject: Move #include "systime.h" before <sys/resource.h>. Don't include
 <sys/time.h> explicitly. Include <stdio.h> unconditionally, not just on
 MacOS.

---
 src/editfns.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/editfns.c')

diff --git a/src/editfns.c b/src/editfns.c
index e7a2372e912..45b7caa280b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include <sys/types.h>
+#include <stdio.h>
 
 #ifdef VMS
 #include "vms-pwd.h"
@@ -33,15 +34,10 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
-/* Without this, sprintf on Mac OS Classic will produce wrong
-   result.  */
-#ifdef MAC_OS8
-#include <stdio.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
+/* systime.h includes <sys/time.h> which, on some systems, is required
+   for <sys/resource.h>; thus systime.h must be included before
+   <sys/resource.h> */
+#include "systime.h"
 
 #if defined HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
@@ -57,8 +53,6 @@ Boston, MA 02111-1307, USA.  */
 #include "frame.h"
 #include "window.h"
 
-#include "systime.h"
-
 #ifdef STDC_HEADERS
 #include <float.h>
 #define MAX_10_EXP	DBL_MAX_10_EXP
-- 
cgit v1.3