Changeset 68569 in vbox for trunk/src/VBox/Additions/solaris/SharedFolders

Timestamp:

Aug 31, 2017 12:10:36 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117786

Message:

merging vbglioc r117734: solaris shared folders build fixes.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_prov.c (modified) (2 diffs)
• vboxfs_vfs.c (modified) (3 diffs)
• vboxfs_vnode.c (modified) (3 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox File System for Solaris Guests, provider implementation.
@@ -42 +43 @@
 #include <sys/dirent.h>
 #include <sys/file.h>
+#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
+
 #include "vboxfs_prov.h"
-#ifdef u
-#undef u
-#endif
 
 #define SFPROV_VERSION  1

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox File System for Solaris Guests, VFS implementation.
@@ -39 +40 @@
 #include <sys/vfs.h>
 #if !defined(VBOX_VFS_SOLARIS_10U6)
-#include <sys/vfs_opreg.h>
+# include <sys/vfs_opreg.h>
 #endif
 #include <sys/pathname.h>
 #include <sys/cmn_err.h>
+#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
+
 #include "vboxfs_prov.h"
 #include "vboxfs_vnode.h"
@@ -48 +51 @@
 #include "vboxfs.h"
 
-#ifdef u
-#undef u
-#endif
 
 #define VBOXSOLQUOTE2(x)                #x

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox File System for Solaris Guests, vnode implementation.
@@ -86 +87 @@
 #include <vm/pvn.h>
 #if !defined(VBOX_VFS_SOLARIS_10U6)
-#include <sys/vfs_opreg.h>
+# include <sys/vfs_opreg.h>
 #endif
 #include <sys/pathname.h>
@@ -93 +94 @@
 #include <sys/time.h>
 #include <sys/cmn_err.h>
+#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
+
 #include "vboxfs_prov.h"
 #include "vboxfs_vnode.h"