diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-23 23:54:30 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-24 01:51:06 -0600 |
| commit | be33f4c611d37ebba59ff618033dc73601339ad1 (patch) | |
| tree | 2d1fdd393172069a89dd5819d614db6a917bc984 /source4/lib | |
| parent | 1ab5bcfb93c9fc7b18d55e6c5995efddf97fea09 (diff) | |
| download | samba-be33f4c611d37ebba59ff618033dc73601339ad1.tar.gz samba-be33f4c611d37ebba59ff618033dc73601339ad1.tar.bz2 samba-be33f4c611d37ebba59ff618033dc73601339ad1.zip | |
r26576: Allow the static module loading code to be used for the Python modules.
Simplify the way module initialization functions are handled.
(This used to be commit ba8be2dfc0de4434c798663336b81f7f95cde520)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/events/events.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/python.mk | 2 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c index fd736e46d8..db7c3a5066 100644 --- a/source4/lib/events/events.c +++ b/source4/lib/events/events.c @@ -102,7 +102,7 @@ void event_set_default_backend(const char *backend) static void event_backend_init(void) { #if _SAMBA_BUILD_ - init_module_fn static_init[] = STATIC_LIBEVENTS_MODULES; + init_module_fn static_init[] = { STATIC_LIBEVENTS_MODULES, NULL }; init_module_fn *shared_init; if (event_backends) return; shared_init = load_samba_modules(NULL, global_loadparm, "events"); diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 72ed969298..f30206dc5b 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -168,7 +168,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name) int ldb_global_init(void) { - int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES; + int (*static_init_fns[])(void) = { STATIC_LIBLDB_MODULES, NULL }; static int initialized = 0; int ret = 0, i; diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk index 12badf04f6..f81c2e3e16 100644 --- a/source4/lib/ldb/python.mk +++ b/source4/lib/ldb/python.mk @@ -1,7 +1,7 @@ ####################### # Start LIBRARY swig_ldb [PYTHON::swig_ldb] -PUBLIC_DEPENDENCIES = LIBLDB LIBPYTHON +PUBLIC_DEPENDENCIES = LIBLDB SWIG_FILE = ldb.i # End LIBRARY swig_ldb ####################### diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index b289ff9afd..f1f50479cb 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -102,6 +102,6 @@ OBJ_FILES = \ tests/registry.o [PYTHON::swig_registry] -PUBLIC_DEPENDENCIES = registry LIBPYTHON +PUBLIC_DEPENDENCIES = registry SWIG_FILE = registry.i |