diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-22 00:50:35 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-22 01:49:59 +0200 |
| commit | 52909271879d909533a86c3a448839debb6497c6 (patch) | |
| tree | f2ab6ceff36f76108e964a87f969a8b8f36e3069 | |
| parent | 0e003515703469e9f66f5119d401366697cdb767 (diff) | |
| download | samba-52909271879d909533a86c3a448839debb6497c6.tar.gz samba-52909271879d909533a86c3a448839debb6497c6.tar.bz2 samba-52909271879d909533a86c3a448839debb6497c6.zip | |
s3-vfs: another attempt to fix the Tru64 build.
vfsops struct on Tru64 has a vfs_init function pointer.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Apr 22 01:49:59 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/include/vfs.h | 4 | ||||
| -rw-r--r-- | source3/wscript | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in index b2c1856bec..97e69a3a57 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5400,6 +5400,8 @@ if test x"$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" = x"yes"; then fi AC_MSG_RESULT([$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT]) +AC_CHECK_TYPE(struct vfsops,[AC_DEFINE(HAVE_STRUCT_VFSOPS,1,[Whether struct vfsops exists])],,[#include <sys/mount.h>]) + ################################################# # check for cluster extensions diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 28d6c38d1d..c86fad8ec4 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -138,7 +138,11 @@ /* to bug old modules which are trying to compile with the old functions */ + +#ifndef HAVE_STRUCT_VFSOPS /* vfsops struct on Tru64 has a vfs_init function pointer */ #define vfs_init __ERROR_please_port_this_module_to_SMB_VFS_INTERFACE_VERSION_8_donot_use_vfs_init_anymore(void) { __ERROR_please_port_this_module_to_SMB_VFS_INTERFACE_VERSION_8_donot_use_vfs_init_anymore }; +#endif /* HAVE_STRUCT_VFSOPS */ + #define lp_parm_string __ERROR_please_port_lp_parm_string_to_lp_parm_const_string_or_lp_parm_talloc_string { \ __ERROR_please_port_lp_parm_string_to_lp_parm_const_string_or_lp_parm_talloc_string }; #define lp_vfs_options __ERROR_please_donot_use_lp_vfs_options_anymore_use_lp_parm_xxxx_functions_instead { \ diff --git a/source3/wscript b/source3/wscript index 49f11f2e5b..672fcbbf54 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1634,6 +1634,8 @@ main() { headers='sys/types.h dirent.h', msg='Checking whether seekdir returns void') + conf.CHECK_TYPE_IN('struct vfsops', 'sys/mount.h') + if Options.options.with_profiling_data: conf.DEFINE('WITH_PROFILE', 1); |