diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-21 18:26:40 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-21 19:13:59 +0200 |
| commit | 1b7cd33291ec69f58a68396cf7406a6da3083df3 (patch) | |
| tree | 114b0bb0d0289629fe1f6d9b808028c1756bfcac /source3 | |
| parent | bb65187b8978c418bff9cca0881b31b5ad9bb93e (diff) | |
| download | samba-1b7cd33291ec69f58a68396cf7406a6da3083df3.tar.gz samba-1b7cd33291ec69f58a68396cf7406a6da3083df3.tar.bz2 samba-1b7cd33291ec69f58a68396cf7406a6da3083df3.zip | |
s3-vfs: try to fix the Tru64 build.
Volker, Jeremy please check.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Apr 21 19:14:00 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/vfs.h | 6 |
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... |