summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/vfs.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 28d6c38d1d..b96ab9243d 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -32,6 +32,12 @@
#undef vfs_ops
#endif
+/* Avoid conflict with an Tru64 include file:
+ the vfsops struct on Tru64 has a vfs_init function pointer which we
+ overwrite with a macro below */
+
+#undef vfsops
+
/*
* As we're now (thanks Andrew ! :-) using file_structs and connection
* structs in the vfs - then anyone writing a vfs must include includes.h...