diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-01 15:38:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-01 18:55:19 +1100 |
| commit | 28c1e4d3eb3162c0177085bae753102994a35846 (patch) | |
| tree | 60f1b1ee601024af24723fa0170b8e5994b6e754 /source4/ntvfs | |
| parent | 4404b4c700270c7607d7b8d792ab23ce1d080463 (diff) | |
| download | samba-28c1e4d3eb3162c0177085bae753102994a35846.tar.gz samba-28c1e4d3eb3162c0177085bae753102994a35846.tar.bz2 samba-28c1e4d3eb3162c0177085bae753102994a35846.zip | |
s4-modules: get rid of the remaining static prototypes for modules
the waf build now generates the prototype declarations for us
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/ntvfs_base.c | 11 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_lease.c | 8 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/sys_notify.c | 4 |
4 files changed, 8 insertions, 19 deletions
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index b581588d9d..d8d73e95fe 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -203,15 +203,8 @@ NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, struct share_config *scfg, e NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx) { static bool initialized = false; - extern NTSTATUS ntvfs_posix_init(void); - extern NTSTATUS ntvfs_cifs_init(void); - extern NTSTATUS ntvfs_smb2_init(void); - extern NTSTATUS ntvfs_nbench_init(void); - extern NTSTATUS ntvfs_unixuid_init(void); - extern NTSTATUS ntvfs_ipc_init(void); - extern NTSTATUS ntvfs_print_init(void); - extern NTSTATUS ntvfs_simple_init(void); - extern NTSTATUS ntvfs_cifs_posix_init(void); +#define _MODULE_PROTO(init) extern NTSTATUS init(void); + STATIC_ntvfs_MODULES_PROTO; init_module_fn static_init[] = { STATIC_ntvfs_MODULES }; init_module_fn *shared_init; diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 9fb2cdf87b..7a3002cf9f 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -92,8 +92,8 @@ const struct pvfs_acl_ops *pvfs_acl_backend_byname(const char *name) NTSTATUS pvfs_acl_init(struct loadparm_context *lp_ctx) { static bool initialized = false; - extern NTSTATUS pvfs_acl_nfs4_init(void); - extern NTSTATUS pvfs_acl_xattr_init(void); +#define _MODULE_PROTO(init) extern NTSTATUS init(void); + STATIC_pvfs_acl_MODULES_PROTO; init_module_fn static_init[] = { STATIC_pvfs_acl_MODULES }; init_module_fn *shared_init; diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index 12fd83e8e0..8b0b3a5110 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -107,15 +107,11 @@ _PUBLIC_ NTSTATUS sys_lease_register(const struct sys_lease_ops *backend) return NT_STATUS_OK; } -#ifndef STATIC_sys_lease_MODULES -#define STATIC_sys_lease_MODULES NULL -#endif - _PUBLIC_ NTSTATUS sys_lease_init(void) { static bool initialized = false; - extern NTSTATUS sys_lease_linux_init(void); - +#define _MODULE_PROTO(init) extern NTSTATUS init(void); + STATIC_sys_lease_MODULES_PROTO; init_module_fn static_init[] = { STATIC_sys_lease_MODULES }; if (initialized) return NT_STATUS_OK; diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index 57e921b206..72509e67a5 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -134,8 +134,8 @@ _PUBLIC_ NTSTATUS sys_notify_register(struct sys_notify_backend *backend) _PUBLIC_ NTSTATUS sys_notify_init(void) { static bool initialized = false; - extern NTSTATUS sys_notify_inotify_init(void); - +#define _MODULE_PROTO(init) extern NTSTATUS init(void); + STATIC_sys_notify_MODULES_PROTO; init_module_fn static_init[] = { STATIC_sys_notify_MODULES }; if (initialized) return NT_STATUS_OK; |