blob: aa5ffde4183ec0ad31dfdf43faa5b8e61ac73bce [file] [log] [blame]
Patrick Williams2194f502022-10-16 14:26:09 -05001From 6384b37cdef4ea868c3cee27bb627e4cfbab7b50 Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 18 Nov 2015 09:03:00 +0000
Brad Bishop15ae2502019-06-18 21:44:24 -04004Subject: [PATCH] Use configure test for struct timespec
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
6Use the configure script to test for struct time spec instead of trying
7to keep track of what platforms has it.
8
9Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
10---
11 open-vm-tools/configure.ac | 1 +
12 open-vm-tools/lib/include/hgfsUtil.h | 8 +-------
13 2 files changed, 2 insertions(+), 7 deletions(-)
14
Brad Bishop15ae2502019-06-18 21:44:24 -040015diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
Patrick Williams2194f502022-10-16 14:26:09 -050016index 124781f99..05f37f275 100644
Brad Bishop15ae2502019-06-18 21:44:24 -040017--- a/open-vm-tools/configure.ac
18+++ b/open-vm-tools/configure.ac
Patrick Williams2194f502022-10-16 14:26:09 -050019@@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020 AC_TYPE_PID_T
21 AC_TYPE_SIZE_T
22 AC_CHECK_MEMBERS([struct stat.st_rdev])
23+AC_CHECK_MEMBERS([struct timespec.tv_sec],[],[],[[#include <time.h>]])
24 AC_HEADER_TIME
25 AC_STRUCT_TM
26 AC_C_VOLATILE
Brad Bishop15ae2502019-06-18 21:44:24 -040027diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h
Patrick Williams2194f502022-10-16 14:26:09 -050028index 609f4c000..a3a022d42 100644
Brad Bishop15ae2502019-06-18 21:44:24 -040029--- a/open-vm-tools/lib/include/hgfsUtil.h
30+++ b/open-vm-tools/lib/include/hgfsUtil.h
Brad Bishopd7bf8c12018-02-25 22:55:05 -050031@@ -53,13 +53,7 @@
32 # include <time.h>
33 # endif
34 # include "vm_basic_types.h"
35-# if !defined _STRUCT_TIMESPEC && \
36- !defined _TIMESPEC_DECLARED && \
37- !defined __timespec_defined && \
38- !defined sun && \
39- !defined __FreeBSD__ && \
40- !__APPLE__ && \
41- !defined _WIN32
42+# if !defined HAVE_STRUCT_TIMESPEC_TV_SEC
43 struct timespec {
44 time_t tv_sec;
45 long tv_nsec;
Patrick Williams2194f502022-10-16 14:26:09 -050046--
472.25.1
48