aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2014-01-25 12:10:41 -0500
committerGene Cumm <gene.cumm@gmail.com>2014-01-25 12:10:41 -0500
commitf70dfb4f1a2f0577b09c5062bebc629a6fc507d4 (patch)
treeaf4b6ed43cc2b247909dad162500a501bca36479
parent27135b2363603b35425798c983f4041329233cca (diff)
parent0b5e47ede938e68c694d1f6e68b07a74d93b0ad6 (diff)
downloadsyslinux-f70dfb4f1a2f0577b09c5062bebc629a6fc507d4.tar.gz
syslinux-f70dfb4f1a2f0577b09c5062bebc629a6fc507d4.tar.xz
syslinux-f70dfb4f1a2f0577b09c5062bebc629a6fc507d4.zip
Merge branch 'syslinux-5.xx' into master; fixes loadkeys
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
-rw-r--r--com32/elflink/ldlinux/readconfig.c5
-rw-r--r--com32/modules/poweroff.c2
-rw-r--r--core/conio.c2
3 files changed, 4 insertions, 5 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 22efbe43..347f8264 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -764,8 +764,8 @@ extern void sirq_cleanup_nowipe(void);
extern void sirq_install(void);
extern void write_serial_str(char *);
-extern void loadfont(char *);
-extern void loadkeys(char *);
+extern void loadfont(const char *);
+extern void loadkeys(const char *);
extern char syslinux_banner[];
extern char copyright_str[];
@@ -868,7 +868,6 @@ static void do_include(char *str)
if (f)
parse_config_file(f);
-bail:
close(fd);
put:
refstr_put(file);
diff --git a/com32/modules/poweroff.c b/com32/modules/poweroff.c
index 3255ac26..41e501e9 100644
--- a/com32/modules/poweroff.c
+++ b/com32/modules/poweroff.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <com32.h>
-int main()
+int main(int argc __unused, char *argv[] __unused)
{
com32sys_t inregs, outregs;
diff --git a/core/conio.c b/core/conio.c
index df929aed..35ef0b4e 100644
--- a/core/conio.c
+++ b/core/conio.c
@@ -54,7 +54,7 @@ uint8_t ScrollAttribute = 0x07; /* Grey on white (normal text color) */
*
* Returns 0 on success, or -1 on error.
*/
-__export int loadkeys(char *filename)
+__export int loadkeys(const char *filename)
{
FILE *f;