mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
emulators/virtualbox-ose: fix build errors on CURRENT
PR: 272991 Reviewed by: corvink, manu Approved by: manu, vbox (maintainer timeout)
This commit is contained in:
parent
0146693b1a
commit
de862b33d4
@ -99,6 +99,8 @@ post-patch:
|
||||
@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
|
||||
${WRKSRC}/LocalConfig.kmk
|
||||
@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
|
||||
@${ECHO_CMD} 'CXXDEFS += _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR' >> \
|
||||
${WRKSRC}/LocalConfig.kmk
|
||||
.if ${COMPILER_TYPE} == clang
|
||||
@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
|
||||
-e 's| -fno-merge-constants||' \
|
||||
|
@ -9,7 +9,7 @@
|
||||
/*
|
||||
* Copyright (C) 2010-2020 Oracle Corporation
|
||||
*
|
||||
@@ -24,72 +19,371 @@
|
||||
@@ -24,72 +19,377 @@
|
||||
#define VBOXVFS_VFSNAME "vboxvfs"
|
||||
#define VBOXVFS_VERSION 1
|
||||
|
||||
@ -134,6 +134,12 @@
|
||||
- int didrele;
|
||||
+#include <VBox/VBoxGuestLibSharedFolders.h>
|
||||
+
|
||||
+#if __FreeBSD_version >= 1400093
|
||||
+typedef __enum_uint8(vtype) enum_vtype_t;
|
||||
+#else
|
||||
+typedef enum vtype enum_vtype_t;
|
||||
+#endif
|
||||
+
|
||||
+#define VBOXVFS_DEBUG(lvl, ...) do { \
|
||||
+ if (vboxvfs_debug >= (lvl)) { \
|
||||
+ printf("VBOXVFS[%u]: ", lvl); \
|
||||
@ -323,7 +329,7 @@
|
||||
+void vboxfs_free_vp(struct vnode *);
|
||||
+
|
||||
+int vboxfs_alloc_node(struct mount *, struct vboxfs_mnt *, const char*,
|
||||
+ enum vtype, uid_t, gid_t, mode_t, struct vboxfs_node *,
|
||||
+ enum_vtype_t, uid_t, gid_t, mode_t, struct vboxfs_node *,
|
||||
+ struct vboxfs_node **);
|
||||
+void vboxfs_free_node(struct vboxfs_mnt *, struct vboxfs_node *);
|
||||
+
|
||||
|
@ -130,7 +130,7 @@
|
||||
+ */
|
||||
+int
|
||||
+vboxfs_alloc_node(struct mount *mp, struct vboxfs_mnt *vsfmp, const char *fullpath,
|
||||
+ enum vtype type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent,
|
||||
+ enum_vtype_t type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent,
|
||||
+ struct vboxfs_node **node)
|
||||
{
|
||||
- struct vboxvfs_mount_info args;
|
||||
|
@ -420,7 +420,7 @@
|
||||
+ */
|
||||
+static int
|
||||
+vboxfs_alloc_file(struct vboxfs_mnt *vboxfsmp, const char *fullpath,
|
||||
+ enum vtype type, mode_t mode, struct vboxfs_node *parent,
|
||||
+ enum_vtype_t type, mode_t mode, struct vboxfs_node *parent,
|
||||
+ int lkflag, struct vnode **vpp)
|
||||
{
|
||||
- return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user