diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/modentry.c | 2 | ||||
| -rw-r--r-- | Src/module.c | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index d73b1cd04..4fbcc3ec7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-19 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * unposted, c.f. 23572: Src/modentry.c: bad prototype. + + * 23571: Src/module.c: AIX definitions weren't right. + 2007-06-19 Clint Adams <clint@zsh.org> * 23569: Completion/Debian/Command/_bts: make 'bts show' diff --git a/Src/modentry.c b/Src/modentry.c index ea2ca6656..4d8217f43 100644 --- a/Src/modentry.c +++ b/Src/modentry.c @@ -4,7 +4,7 @@ int setup_ _((Module)); int boot_ _((Module)); int cleanup_ _((Module)); int finish_ _((Module)); -int modentry _((int boot, Module m)); +int modentry _((int boot, Module m, void *ptr)); /**/ int diff --git a/Src/module.c b/Src/module.c index 05a0d402a..d40bb133a 100644 --- a/Src/module.c +++ b/Src/module.c @@ -1341,42 +1341,42 @@ module_loaded(const char *name) static int dyn_setup_module(Module m) { - return ((int (*)_((int,Module))) m->u.handle)(0, m, NULL); + return ((int (*)_((int,Module, void*))) m->u.handle)(0, m, NULL); } /**/ static int dyn_features_module(Module m, char ***features) { - return ((int (*)_((int,Module))) m->u.handle)(4, m, features); + return ((int (*)_((int,Module, void*))) m->u.handle)(4, m, features); } /**/ static int dyn_enables_module(Module m, int **enables) { - return ((int (*)_((int,Module))) m->u.handle)(5, m, enables); + return ((int (*)_((int,Module, void*))) m->u.handle)(5, m, enables); } /**/ static int dyn_boot_module(Module m) { - return ((int (*)_((int,Module))) m->u.handle)(1, m, NULL); + return ((int (*)_((int,Module, void*))) m->u.handle)(1, m, NULL); } /**/ static int dyn_cleanup_module(Module m) { - return ((int (*)_((int,Module))) m->u.handle)(2, m, NULL); + return ((int (*)_((int,Module, void*))) m->u.handle)(2, m, NULL); } /**/ static int dyn_finish_module(Module m) { - return ((int (*)_((int,Module))) m->u.handle)(3, m, NULL); + return ((int (*)_((int,Module,void *))) m->u.handle)(3, m, NULL); } /**/ |