Changeset 80713 in vbox

Timestamp:

Sep 10, 2019 9:29:57 PM (5 years ago)

Author:

vboxsync

Message:

Additions/linux: ticketref:18917: VBox 6.0.10 GAs fail to compile on Red Hat/CentOS/OL 7.7; also Red Hat 8.1 Beta (fix build and remove manifest constant duplication)

Location:

trunk/src/VBox

Files:

• Additions/linux/sharedfolders/regops.c (modified) (1 diff)
• Runtime/r0drv/linux/memuserkernel-r0drv-linux.c (modified) (1 diff)
• Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -80 +80 @@
 #endif
 
-#ifdef RHEL_RELEASE_CODE
-# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1)
-#  define RHEL_81
-# endif
-#endif
 
 /*********************************************************************************************************************************

trunk/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c

@@ -35 +35 @@
 #include <iprt/errcore.h>
 
-#ifdef RHEL_RELEASE_CODE
-# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1)
-#  define RHEL_81
-# endif
-#endif
 
 RTR0DECL(int) RTR0MemUserCopyFrom(void *pvDst, RTR3PTR R3PtrSrc, size_t cb)

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -466 +466 @@
 RTDECL(struct page *) rtR0MemObjLinuxVirtToPage(void *pv);
 
+/*
+ * Guest Additions changes specific to Red Hat 8.1 and later.
+ */
+#ifdef RHEL_RELEASE_CODE
+# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1)
+#  define RHEL_81
+# endif
+#endif
 
 #endif /* !IPRT_INCLUDED_SRC_r0drv_linux_the_linux_kernel_h */