better detection of utime/utimes from ian@wasabisystems.com

diff --git a/src/magic.c b/src/magic.c
index 2f57892cf795a7cb2be338eaad78fd836539d131..0ecf2d30c2983a1cc44c0207c5bcd83eb1de8439 100644 (file)
--- a/src/magic.c
+++ b/src/magic.c
@@ -42,14 +42,14 @@
 #include <sys/mman.h>
 #endif
 
-#if defined(HAVE_UTIME)
+#if defined(HAVE_UTIMES)
+# include <sys/time.h>
+#elif defined(HAVE_UTIME)
 # if defined(HAVE_SYS_UTIME_H)
 #  include <sys/utime.h>
 # elif defined(HAVE_UTIME_H)
 #  include <utime.h>
 # endif
-#elif defined(HAVE_UTIMES)
-# include <sys/time.h>
 #endif
 
 #ifdef HAVE_UNISTD_H
@@ -65,7 +65,7 @@
 #include "patchlevel.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$Id: magic.c,v 1.21 2004/06/04 14:40:20 christos Exp $")
+FILE_RCSID("@(#)$Id: magic.c,v 1.22 2004/07/24 19:55:17 christos Exp $")
 #endif /* lint */
 
 #ifdef __EMX__