summaryrefslogtreecommitdiff
path: root/source4/lib/iconv.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-06 23:23:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:36 -0500
commit71db46ea665606384f2be1be708c74c97c9adfb2 (patch)
tree24c84e12f4fc925f3ec1e69348493d7222df1e44 /source4/lib/iconv.c
parentb012ab557b8f8a2f58dfbbe8b7818f3e6d8cf38f (diff)
downloadsamba-71db46ea665606384f2be1be708c74c97c9adfb2.tar.gz
samba-71db46ea665606384f2be1be708c74c97c9adfb2.tar.bz2
samba-71db46ea665606384f2be1be708c74c97c9adfb2.zip
r3586: Fix some of the issues with the module init functions.
Both subsystems and modules can now have init functions, which can be specified in .mk files (INIT_FUNCTION = ...) The build system will define : - SUBSYSTEM_init_static_modules that calls the init functions of all statically compiled modules. Failing to load will generate an error which is not fatal - BINARY_init_subsystems that calls the init functions (if defined) for the subsystems the binary depends on This removes the hack with the "static bool Initialised = " and the "lazy_init" functions (This used to be commit 7a8244761bfdfdfb48f8264d76951ebdfbf7bd8a)
Diffstat (limited to 'source4/lib/iconv.c')
-rw-r--r--source4/lib/iconv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/iconv.c b/source4/lib/iconv.c
index a08e0ee69a..085ec0ec2f 100644
--- a/source4/lib/iconv.c
+++ b/source4/lib/iconv.c
@@ -100,7 +100,9 @@ static void lazy_initialize_iconv(void)
if (!initialized) {
initialized = True;
register_subsystem("charset", charset_register_backend);
-
+
+ charset_init_static_modules;
+
for(i = 0; builtin_functions[i].name; i++)
register_backend("charset", &builtin_functions[i]);
}