aboutsummaryrefslogtreecommitdiffstats
path: root/core
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 /core
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>
Diffstat (limited to 'core')
-rw-r--r--core/conio.c2
1 files changed, 1 insertions, 1 deletions
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;