diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-09 22:25:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-06 07:18:07 +0200 |
| commit | 355b5e3a831415d9bef97de4b2d83e353de4ab0f (patch) | |
| tree | 5fceb57b6e7f1f7242030ae308927a4c5a7e2f5f /source3 | |
| parent | a718b5a4f1ebfb63aec2f43b654d8e97f099fe85 (diff) | |
| download | samba-355b5e3a831415d9bef97de4b2d83e353de4ab0f.tar.gz samba-355b5e3a831415d9bef97de4b2d83e353de4ab0f.tar.bz2 samba-355b5e3a831415d9bef97de4b2d83e353de4ab0f.zip | |
modules: standardise on samba_init_module as the hook symbol to resolve
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/exports/modules-darwin.syms | 2 | ||||
| -rw-r--r-- | source3/m4/aclocal.m4 | 2 | ||||
| -rw-r--r-- | source3/modules/perfcount_test.c | 2 | ||||
| -rw-r--r-- | source3/wscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/exports/modules-darwin.syms b/source3/exports/modules-darwin.syms index be457614d8..276543b8de 100644 --- a/source3/exports/modules-darwin.syms +++ b/source3/exports/modules-darwin.syms @@ -1 +1 @@ -_init_samba_module +_samba_init_module diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index 6112a647fe..a4db42e5ca 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -25,7 +25,7 @@ AC_DEFUN(SMB_MODULE, fi if test x"$DEST" = xSHARED; then - AC_DEFINE([$1][_init], [init_samba_module], [Whether to build $1 as shared module]) + AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module]) $4_MODULES="$$4_MODULES $3" AC_MSG_RESULT([shared]) [$6] diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c index 99904ac3da..8d17ee513f 100644 --- a/source3/modules/perfcount_test.c +++ b/source3/modules/perfcount_test.c @@ -381,7 +381,7 @@ static struct smb_perfcount_handlers perfcount_test_handlers = { perfcount_test_end }; -NTSTATUS init_samba_module(void) +NTSTATUS samba_init_module(void) { return smb_register_perfcounter(SMB_PERFCOUNTER_INTERFACE_VERSION, "pc_test", &perfcount_test_handlers); diff --git a/source3/wscript b/source3/wscript index 86949d258c..d7764289d2 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1817,7 +1817,7 @@ main() { conf.DEFINE('static_init_%s' % p, '{}') if p in shared_list: for entry in shared_list[p]: - conf.DEFINE('%s_init' % entry, 'init_samba_module') + conf.DEFINE('%s_init' % entry, 'samba_init_module') conf.env[shared_env].append('%s' % entry) if not os.getenv('TOPLEVEL_BUILD'): |