diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-22 09:45:59 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-22 09:45:59 -0800 |
| commit | 9e25d6029b8c1568a74a7d9b5bc07f22b0fb8ade (patch) | |
| tree | 5804b971440fca843ae7c6fbe96db70d2f506291 /com32/include | |
| parent | 2b164fd1078bc9640836f15598ed901cc7a31ae2 (diff) | |
| parent | 6c7159d13c948afcc067635d0cc0c6aae39a04bf (diff) | |
| download | syslinux-9e25d6029b8c1568a74a7d9b5bc07f22b0fb8ade.tar.gz syslinux-9e25d6029b8c1568a74a7d9b5bc07f22b0fb8ade.tar.xz syslinux-9e25d6029b8c1568a74a7d9b5bc07f22b0fb8ade.zip | |
Merge commit 'syslinux-3.84'
Resolved Conflicts:
Makefile
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/include')
| -rw-r--r-- | com32/include/syslinux/video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/include/syslinux/video.h b/com32/include/syslinux/video.h index 737c742b..93df2a06 100644 --- a/com32/include/syslinux/video.h +++ b/com32/include/syslinux/video.h @@ -38,6 +38,6 @@ void syslinux_force_text_mode(void); int syslinux_report_video_mode(uint16_t flags, uint16_t xsize, uint16_t ysize); -int syslinux_font_query(void **font); +int syslinux_font_query(uint8_t **font); #endif /* _SYSLINUX_API_H */ |