From 01bfa9501df0573cda69fccc048bc6bf5f5cb46744f2c892cfd10ee555075695 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 20 Jun 2018 21:34:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=435 --- fix_32_bit_builds.patch | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/fix_32_bit_builds.patch b/fix_32_bit_builds.patch index bd8572d..51faec0 100644 --- a/fix_32_bit_builds.patch +++ b/fix_32_bit_builds.patch @@ -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 - #include - #include --#include -+#include - #include - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) - # include