From 1b7cd33291ec69f58a68396cf7406a6da3083df3 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 21 Apr 2011 18:26:40 +0200 Subject: s3-vfs: try to fix the Tru64 build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Volker, Jeremy please check. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Thu Apr 21 19:14:00 CEST 2011 on sn-devel-104 --- source3/include/vfs.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/include/vfs.h') 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... -- cgit