Mercurial > emacs

changeset 58029:46a652255057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move #include "systime.h" before <sys/resource.h>. Don't include <sys/time.h> explicitly. Include <stdio.h> unconditionally, not just on MacOS.
author Eli Zaretskii <eliz@gnu.org>
date Mon, 08 Nov 2004 12:04:07 +0000
parents 7b117bb1e320
children 4705869d065e
files src/editfns.c
diffstat 1 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/editfns.c	Mon Nov 08 02:37:02 2004 +0000
+++ b/src/editfns.c	Mon Nov 08 12:04:07 2004 +0000
@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include <sys/types.h>
+#include <stdio.h>
 
 #ifdef VMS
 #include "vms-pwd.h"
@@ -33,15 +34,10 @@
 #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 @@
 #include "frame.h"
 #include "window.h"
 
-#include "systime.h"
-
 #ifdef STDC_HEADERS
 #include <float.h>
 #define MAX_10_EXP	DBL_MAX_10_EXP