Changeset 83473 in vbox for trunk

Timestamp:

Mar 27, 2020 5:57:57 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136712

Message:

Linux: ticketref:19312 Linux: kernel 5.6 - we need changes: fix non-linux builds

File:

• trunk/include/iprt/time.h (modified) (3 diffs)

trunk/include/iprt/time.h

@@ -358 +358 @@
 
 /* PORTME: Add struct timeval guard macro here. */
-#if defined(RTTIME_INCL_TIMEVAL) || defined(_STRUCT_TIMEVAL) || defined(_SYS__TIMEVAL_H_) || defined(_SYS_TIME_H) || defined(_TIMEVAL) || defined(_LINUX_TIME_H) \
- || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_))
 /*
  * Starting with Linux kernel version 5.6-rc3, the struct timeval is no longer
@@ -365 +363 @@
  * Only 64-bit time-interfaces are allowed into the kernel.
  */
-# if defined(RT_OS_LINUX) && (!defined(__KERNEL__) || !defined(_LINUX_TIME64_H))
+#if defined(RT_OS_LINUX) && (defined(__KERNEL__) || defined(_LINUX_TIME64_H))
+#define RTTIME_NO_TIMEVAL
+#endif
+#if !defined(RTTIME_NO_TIMEVAL) \
+ && (defined(RTTIME_INCL_TIMEVAL) || defined(_STRUCT_TIMEVAL) || defined(_SYS__TIMEVAL_H_) \
+ || defined(_SYS_TIME_H) || defined(_TIMEVAL) || defined(_LINUX_TIME_H) \
+ || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_)))
 /**
  * Gets the time as POSIX timeval.
@@ -399 +403 @@
     return RTTimeSpecAddMicro(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), pTimeval->tv_usec);
 }
-# endif /* RT_OS_LINUX ... */
 #endif /* various ways of detecting struct timeval */