[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3337-gb46ce28

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  b46ce28039e8829f5188574ebe84ff3b7d9e65bc (commit)
      from  bf8453da9af1be788955204cc581c5143a854072 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit b46ce28039e8829f5188574ebe84ff3b7d9e65bc
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jul 18 10:01:39 2008 +0200

    Fix the build of vfs_zfsacl.c
    (cherry picked from commit b83beeda44e1c8d485c2ad6bb8ee539cdcbe8bda)

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_zfsacl.c |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_zfsacl.c b/source/modules/vfs_zfsacl.c
index e8a0507..e933e47 100644
--- a/source/modules/vfs_zfsacl.c
+++ b/source/modules/vfs_zfsacl.c
@@ -224,23 +224,8 @@ static vfs_op_tuple zfsacl_ops[] = {
 	{SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
 };
 
-/* != 0 if this module will be compiled as static */
-
-#define STATIC 0
-
-#if STATIC
 NTSTATUS vfs_zfsacl_init(void);
-#else
-NTSTATUS init_module(void);
-#endif
-
-NTSTATUS
-#if STATIC
-	vfs_zfsacl_init
-#else
-	init_module
-#endif
-		(void)
+NTSTATUS vfs_zfsacl_init(void)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "zfsacl",
 				zfsacl_ops);


-- 
Samba Shared Repository