Revert "s3-vfs: another attempt to fix the Tru64 build."

This reverts commit 52909271879d909533a86c3a448839debb6497c6.

A better fix will follow.

metze

diff --git a/source3/configure.in b/source3/configure.in
index 97e69a3a573fd24805572ace5cbdd55db61331f5..b2c1856beccd2c9c2402f4609a094c4accb10398 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5400,8 +5400,6 @@ 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 c86fad8ec4514389c570f6b5dbcab422b3dfa53d..28d6c38d1dde0fecc49b9906e91aeb968ea6c0e5 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -138,11 +138,7 @@
 
 
 /* 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 672fcbbf54443ef19bbe50f67587818b365e7bf1..49f11f2e5b2393d401b6333efdf9a8b7a74737fd 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -1634,8 +1634,6 @@ 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);