vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix typo (failback vs fallback).

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-06-07 15:35:16 +02:00
parent f25870887b
commit ccfc0bdb53
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-06-07 Vladimir Serbinenko <phcoder@gmail.com>
Fix typo (failback vs fallback).
2013-05-31 Andrey Borzenkov <arvidjaar@gmail.com> 2013-05-31 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub.d/30_os-prober.in: Add support for probing EFI * util/grub.d/30_os-prober.in: Add support for probing EFI

2
conf/Makefile.common
View file

@ -27,7 +27,7 @@ if COND_i386_ieee1275
endif endif
if COND_mips_loongson if COND_mips_loongson
CFLAGS_PLATFORM += -mexplicit-relocs CFLAGS_PLATFORM += -mexplicit-relocs
CPPFLAGS_PLATFORM = -DUSE_ASCII_FAILBACK CPPFLAGS_PLATFORM = -DUSE_ASCII_FALLBACK
endif endif
if COND_mips if COND_mips
CFLAGS_PLATFORM += -mflush-func=grub_red_herring CFLAGS_PLATFORM += -mflush-func=grub_red_herring

2
grub-core/Makefile.am
View file

@ -10,7 +10,7 @@ CCAS=$(TARGET_CC)
if COND_GRUB_MKFONT if COND_GRUB_MKFONT
if COND_HAVE_FONT_SOURCE if COND_HAVE_FONT_SOURCE
TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1 TARGET_CFLAGS += -DUSE_ASCII_FALLBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
endif endif
endif endif

2
grub-core/Makefile.core.def
View file

@ -77,7 +77,7 @@ kernel = {
mips_qemu_mips_ldflags = '-Wl,-Ttext,0x80200000'; mips_qemu_mips_ldflags = '-Wl,-Ttext,0x80200000';
mips_arc_cppflags = '-DGRUB_DECOMPRESSOR_LINK_ADDR=$(TARGET_DECOMPRESSOR_LINK_ADDR)'; mips_arc_cppflags = '-DGRUB_DECOMPRESSOR_LINK_ADDR=$(TARGET_DECOMPRESSOR_LINK_ADDR)';
mips_loongson_cppflags = '-DUSE_ASCII_FAILBACK'; mips_loongson_cppflags = '-DUSE_ASCII_FALLBACK';
i386_qemu_cppflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)'; i386_qemu_cppflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
emu_cflags = '$(CFLAGS_GNULIB)'; emu_cflags = '$(CFLAGS_GNULIB)';
emu_cppflags = '$(CPPFLAGS_GNULIB)'; emu_cppflags = '$(CPPFLAGS_GNULIB)';

6
grub-core/font/font.c
View file

@ -33,7 +33,7 @@
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
#ifdef USE_ASCII_FAILBACK #ifdef USE_ASCII_FALLBACK
#include "ascii.h" #include "ascii.h"
#endif #endif
@ -110,14 +110,14 @@ static struct grub_font null_font;
/* Flag to ensure module is initialized only once. */ /* Flag to ensure module is initialized only once. */
static grub_uint8_t font_loader_initialized; static grub_uint8_t font_loader_initialized;
#ifdef USE_ASCII_FAILBACK #ifdef USE_ASCII_FALLBACK
static struct grub_font_glyph *ascii_font_glyph[0x80]; static struct grub_font_glyph *ascii_font_glyph[0x80];
#endif #endif
static struct grub_font_glyph * static struct grub_font_glyph *
ascii_glyph_lookup (grub_uint32_t code) ascii_glyph_lookup (grub_uint32_t code)
{ {
#ifdef USE_ASCII_FAILBACK #ifdef USE_ASCII_FALLBACK
static int ascii_failback_initialized = 0; static int ascii_failback_initialized = 0;
if (code >= 0x80) if (code >= 0x80)