Build: separate guard for futimens()

Darwin does not have the data element we manipulate with futimens()

diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index 548a82d4bd0111d4ac9d9dd702a22082ea6b4b33..c1720a796d9313363912edf303b611f3c3c80859 100644 (file)
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -15,6 +15,7 @@
 #define HAVE_SRANDOMDEV
 #define HAVE_ARC4RANDOM
 #define EXIM_HAVE_OPENAT
 #define HAVE_SRANDOMDEV
 #define HAVE_ARC4RANDOM
 #define EXIM_HAVE_OPENAT

+#define EXIM_HAVE_FUTIMENS

 
 /* Applications should not call arc4random_stir() explicitly after
  * FreeBSD r227520 (approximately 1000002).
 
 /* Applications should not call arc4random_stir() explicitly after
  * FreeBSD r227520 (approximately 1000002).

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index ba5f13450251d89f5afff43ec88a0edf3b0a99d9..4a141346d982f3f4b3fa02ebdb7f8b57b80e36f1 100644 (file)
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -73,6 +73,7 @@ then change the 0 to 1 in the next block. */
 
 #if _POSIX_C_SOURCE >= 200809L || _ATFILE_SOURCE
 # define EXIM_HAVE_OPENAT
 
 #if _POSIX_C_SOURCE >= 200809L || _ATFILE_SOURCE
 # define EXIM_HAVE_OPENAT

+# define EXIM_HAVE_FUTIMENS

 #endif
 
 /* TCP Fast Open support */
 #endif
 
 /* TCP Fast Open support */

diff --git a/src/OS/os.h-OpenBSD b/src/OS/os.h-OpenBSD
index dc5dc0233e35e2544ab6e69ef4a3108c1110ed75..f599c09e4a4b66bb137bb8ecc9ae5204cd0febbd 100644 (file)
--- a/src/OS/os.h-OpenBSD
+++ b/src/OS/os.h-OpenBSD
@@ -8,6 +8,7 @@
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 #define EXIM_HAVE_OPENAT
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 #define EXIM_HAVE_OPENAT

+#define EXIM_HAVE_FUTIMENS

 #define HAVE_ARC4RANDOM
 /* In May 2014, OpenBSD 5.5 was released which cleaned up the arc4random_* API
    which removed the arc4random_stir() function. Set NOT_HAVE_ARC4RANDOM_STIR
 #define HAVE_ARC4RANDOM
 /* In May 2014, OpenBSD 5.5 was released which cleaned up the arc4random_* API
    which removed the arc4random_stir() function. Set NOT_HAVE_ARC4RANDOM_STIR

diff --git a/src/OS/os.h-SunOS5 b/src/OS/os.h-SunOS5
index 6331f3701fc0c6863fd7c8d76687857ee796cb24..f5bc31668b66c78ff9c0b6ac0c54121e47adf8c1 100644 (file)
--- a/src/OS/os.h-SunOS5
+++ b/src/OS/os.h-SunOS5
@@ -9,6 +9,7 @@
 #define HAVE_GETIPNODEBYNAME    1
 #define HAVE_GETIPNODEBYADDR    1
 #define EXIM_HAVE_OPENAT
 #define HAVE_GETIPNODEBYNAME    1
 #define HAVE_GETIPNODEBYADDR    1
 #define EXIM_HAVE_OPENAT

+#define EXIM_HAVE_FUTIMENS

 
 #define HAVE_KSTAT
 #define LOAD_AVG_KSTAT         "system_misc"
 
 #define HAVE_KSTAT
 #define LOAD_AVG_KSTAT         "system_misc"

diff --git a/src/src/exim_lock.c b/src/src/exim_lock.c
index 068216816054e832085d9cb035daa8ae50f12ba8..2624aff5e2557ac88368bf82f86cd070c774e34c 100644 (file)
--- a/src/src/exim_lock.c
+++ b/src/src/exim_lock.c
@@ -584,7 +584,7 @@ else
 if (restore_times)
   {
   struct stat strestore;
 if (restore_times)
   {
   struct stat strestore;

-#ifdef EXIM_HAVE_OPENAT
+#ifdef EXIM_HAVE_FUTIMENS

   int fd = open(filename, O_RDWR); /* use fd for both get & restore */
   struct timespec tt[2];
 
   int fd = open(filename, O_RDWR); /* use fd for both get & restore */
   struct timespec tt[2];