Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Jul 2018 16:15:31 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474458 - head/emulators/virtualbox-ose/files
Message-ID:  <201807111615.w6BGFVj4098077@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Wed Jul 11 16:15:31 2018
New Revision: 474458
URL: https://svnweb.freebsd.org/changeset/ports/474458

Log:
  Unbreak emulators/virtualbox-ose-additions and emulators/virtualbox-ose-kmod
  on head after r335879.

Added:
  head/emulators/virtualbox-ose/files/patch-include_iprt_string.h   (contents, props changed)
Modified:
  head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h

Added: head/emulators/virtualbox-ose/files/patch-include_iprt_string.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-include_iprt_string.h	Wed Jul 11 16:15:31 2018	(r474458)
@@ -0,0 +1,14 @@
+--- include/iprt/string.h.orig	2018-06-29 13:08:03 UTC
++++ include/iprt/string.h
+@@ -43,6 +43,11 @@
+ #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
+   RT_C_DECLS_BEGIN
+ # include <sys/libkern.h>
++  /*
++   * Kludge for the FreeBSD kernel:
++   *  sys/libkern.h includes sys/param.h via sys/systm.h since r335879.
++   */
++# undef PVM
+   RT_C_DECLS_END
+ 
+ #elif defined(RT_OS_NETBSD) && defined(_KERNEL)

Modified: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h	Wed Jul 11 15:52:26 2018	(r474457)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h	Wed Jul 11 16:15:31 2018	(r474458)
@@ -1,4 +1,4 @@
---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig	2017-10-18 07:06:47 UTC
+--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig	2018-06-29 13:08:17 UTC
 +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
 @@ -1,8 +1,3 @@
 -/* $Id: vboxvfs.h $ */
@@ -7,9 +7,9 @@
 - */
 -
  /*
-  * Copyright (C) 2010-2016 Oracle Corporation
+  * Copyright (C) 2010-2017 Oracle Corporation
   *
-@@ -21,72 +16,416 @@
+@@ -21,72 +16,413 @@
  #define VBOXVFS_VFSNAME "vboxvfs"
  #define VBOXVFS_VERSION 1
  
@@ -174,9 +174,6 @@
 -    long            nextino;
 -    int             caseopt;
 -    int             didrele;
-+#if defined(RT_OS_FREEBSD) && defined(_KERNEL)
-+# undef PVM /** XXX: For not conflict with PVM in sys/priority.h */
-+#endif
 +#include <VBox/VBoxGuestLibSharedFolders.h>
 +
 +#define	VBOXVFS_DEBUG(lvl, ...)	do {					\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807111615.w6BGFVj4098077>