Changeset 85207 in vbox for trunk/include

Timestamp:

Jul 10, 2020 9:31:49 PM (5 years ago)

Author:

vboxsync

Message:

iprt/time.h: I was mistaken we actually need timespec for older kernels. Test-compiled against 4.13 (on windows ;-). bugref:9757

File:

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

trunk/include/iprt/time.h

@@ -356 +356 @@
 }
 
+/** @def RTTIME_LINUX_KERNEL_PREREQ
+ * @note Cannot really be moved to iprt/cdefs.h, see the-linux-kernel.h */
+#if defined(RT_OS_LINUX) && defined(LINUX_KERNEL_VERSION) && defined(KERNEL_VERSION)
+# define RTTIME_LINUX_KERNEL_PREREQ(a, b, c)    (LINUX_VERSION_CODE < KERNEL_VERSION(a,b,c))
+#else
+# define RTTIME_LINUX_KERNEL_PREREQ(a, b, c)    0
+#endif
 
 /* PORTME: Add struct timeval guard macro here. */
@@ -365 +372 @@
  || (   defined(RT_OS_LINUX) \
      && defined(_LINUX_TIME_H) \
-     && (!defined(__KERNEL__) /* || < 5.6-rc3 - but we don't need this in ring-0. @bugref{9757} */)) \
+     && (!defined(__KERNEL__) || !RTTIME_LINUX_KERNEL_PREREQ(5,6,0)) /* @bugref{9757} */ ) \
  || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_))
 
@@ -411 +418 @@
  || defined(_TIMESPEC) \
  || (   defined(_STRUCT_TIMESPEC) \
-     && (!defined(RT_OS_LINUX) || !defined(__KERNEL__) /* || < 5.6-rc3 - but we don't need this in ring-0. @bugref{9757} */) ) \
+     && (   !defined(RT_OS_LINUX) \
+         || !defined(__KERNEL__) \
+         || !RTTIME_LINUX_KERNEL_PREREQ(5,6,0) /* @bugref{9757} */)) \
  || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_))
 
@@ -459 +468 @@
  * @param   pTimespec   Where to store the time as linux 64-bit timespec.
  */
-DECLINLINE(struct timespec64 *) RTTimeSpecSetTimespec64(PCRTTIMESPEC pTime, struct timespec64 *pTimespec)
+DECLINLINE(struct timespec64 *) RTTimeSpecGetTimespec64(PCRTTIMESPEC pTime, struct timespec64 *pTimespec)
 {
     int64_t i64 = RTTimeSpecGetNano(pTime);