jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=435

Browse Source
This commit is contained in:
Larry Finger 2018-06-20 21:34:22 +00:00 committed by Git OBS Bridge
parent 147d5e0bbb
commit 01bfa9501d
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fix_32_bit_builds.patch
View File

@ -2,34 +2,27 @@ Index: VirtualBox-5.2.12/src/VBox/Additions/linux/sharedfolders/utils.c
===================================================================
--- VirtualBox-5.2.12.orig/src/VBox/Additions/linux/sharedfolders/utils.c
+++ VirtualBox-5.2.12/src/VBox/Additions/linux/sharedfolders/utils.c
@@ -50,7 +50,7 @@ static void sf_timespec_from_ftime(RTTIM
@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM
RTTimeSpecSetNano(ts, t);
}
#else /* >= 2.6.0 */
-static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts)
+#else
static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
+#endif
{
int64_t t = RTTimeSpecGetNano(ts);
int64_t nsec;
@@ -60,7 +60,7 @@ static void sf_ftime_from_timespec(struc
@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc
tv->tv_nsec = nsec;
}
-static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv)
+#else
static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
+#endif
{
int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
RTTimeSpecSetNano(ts, t);
Index: VirtualBox-5.2.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-5.2.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-5.2.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -98,7 +98,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/slab.h>
-#include <linux/time.h>
+#include <linux/time64.h>
#include <linux/sched.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
# include <linux/sched/rt.h>