aboutsummaryrefslogtreecommitdiffstats
path: root/efi/vesa.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-10 11:22:56 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-11 09:28:38 +0000
commitafd985f6eec18a0f66a8fc55f9c5e3431128310f (patch)
treeb4e657eccfd9a6f993286f49bc2b6951ef68eb56 /efi/vesa.c
parente394bc5e14d6e0d588178bf4a78f942acd423135 (diff)
downloadsyslinux-afd985f6eec18a0f66a8fc55f9c5e3431128310f.tar.gz
syslinux-afd985f6eec18a0f66a8fc55f9c5e3431128310f.tar.xz
syslinux-afd985f6eec18a0f66a8fc55f9c5e3431128310f.zip
Revert "vesa: Correct screencpy() prototype"
This reverts commit 15a67011987c341814533ac4d8e23c9a72dc7605, because as Peter points out, The objects are uint32_t and so the prototype is correct. It should not "leak" outside the screencpy function that we play ugly tricks with these pointers; that is better handled by an internal cast. So do the necessary casting inside bios_vesacon_screencpy(). Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'efi/vesa.c')
-rw-r--r--efi/vesa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/efi/vesa.c b/efi/vesa.c
index 87308fd5..e3e9e0f7 100644
--- a/efi/vesa.c
+++ b/efi/vesa.c
@@ -274,7 +274,7 @@ exit:
return err;
}
-static void efi_vesacon_screencpy(size_t dst, const char *s,
+static void efi_vesacon_screencpy(size_t dst, const uint32_t *s,
size_t bytes, struct win_info *wi)
{
size_t win_off;