The branch, master has been updated
via 5290927 s3-vfs: another attempt to fix the Tru64 build.
via 0e00351 s3-waf: try to fix the build on sunos5.
via a505806 s3-waf: fix typo in comment.
via 3a72586 Revert "s3-vfs: try to fix the Tru64 build."
from 1b7cd33 s3-vfs: try to fix the Tru64 build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 52909271879d909533a86c3a448839debb6497c6
Author: Günther Deschner <[email protected]>
Date: Fri Apr 22 00:50:35 2011 +0200
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 <[email protected]>
Autobuild-Date: Fri Apr 22 01:49:59 CEST 2011 on sn-devel-104
commit 0e003515703469e9f66f5119d401366697cdb767
Author: Günther Deschner <[email protected]>
Date: Fri Apr 22 00:49:54 2011 +0200
s3-waf: try to fix the build on sunos5.
Guenther
commit a505806aa088470c74ad3fbffac223d5400481fc
Author: Günther Deschner <[email protected]>
Date: Fri Apr 22 00:49:28 2011 +0200
s3-waf: fix typo in comment.
Guenther
commit 3a725862cc5c2c32167871bdec0e7dc2ebe39a87
Author: Günther Deschner <[email protected]>
Date: Fri Apr 22 00:15:47 2011 +0200
Revert "s3-vfs: try to fix the Tru64 build."
This reverts commit 1b7cd33291ec69f58a68396cf7406a6da3083df3.
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 2 ++
source3/include/vfs.h | 10 ++++------
source3/wscript | 6 +++++-
3 files changed, 11 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index b2c1856..97e69a3 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 b96ab92..c86fad8 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -32,12 +32,6 @@
#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...
@@ -144,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 673fdf3..672fcbb 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -191,7 +191,7 @@ main() {
'HAVE_KERNEL_OPLOCKS_IRIX', headers='fcntl.h',
msg="Checking for IRIX kernel oplock types")
- # Check for krenel share modes
+ # Check for kernel share modes
conf.CHECK_CODE('''
#include <sys/types.h>
#include <fcntl.h>
@@ -334,6 +334,8 @@ utimensat vsyslog _write __write __xstat
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
elif (host_os.rfind('openbsd') > -1):
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+ elif (host_os.rfind('sunos') > -1):
+ conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
# FIXME: Add more checks here.
else:
Logs.warn("Unknown host_os '%s', please report this to
[email protected]" % host_os)
@@ -1632,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);
--
Samba Shared Repository
