diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-04-02 17:07:59 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-04-17 10:58:34 +0100 |
commit | 5dd53846001c7cd483ed32207f53a54977f9a11f (patch) | |
tree | b85971cb1ac80216f2ca0679772be593c140f3a9 | |
parent | a523208a0d1bb820d82c5b00125876476453afd1 (diff) | |
download | syslinux-5dd53846001c7cd483ed32207f53a54977f9a11f.tar.gz syslinux-5dd53846001c7cd483ed32207f53a54977f9a11f.tar.xz syslinux-5dd53846001c7cd483ed32207f53a54977f9a11f.zip |
ldlinux: Add prototype for new_linux_kernel()
Make sure we're passing the correct arguments to new_linux_kernel() by
defining a prototype. This also fixes the following warning,
execute.c:108:3: warning: implicit declaration of function ‘new_linux_kernel’
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r-- | com32/elflink/ldlinux/config.h | 2 | ||||
-rw-r--r-- | com32/elflink/ldlinux/execute.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/config.h b/com32/elflink/ldlinux/config.h index 1e78c2cd..cab4c70b 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -42,4 +42,6 @@ extern void print_labels(const char *prefix, size_t len); extern void eprintf(const char *filename, ...); +extern int new_linux_kernel(char *okernel, char *ocmdline); + #endif /* __CONFIG_H__ */ diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c index 9a17cf5a..afe999e2 100644 --- a/com32/elflink/ldlinux/execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -20,6 +20,7 @@ #include "core.h" #include "menu.h" #include "fs.h" +#include "config.h" /* Must match enum kernel_type */ const char *const kernel_types[] = { @@ -105,7 +106,7 @@ void execute(const char *cmdline, enum kernel_type type) } else { /* Need add one item for kernel load, as we don't use * the assembly runkernel.inc any more */ - new_linux_kernel(kernel, cmdline); + new_linux_kernel((char *)kernel, (char *)cmdline); } lfree((void *)kernel); |