From ccfc0bdb5350409a88f0ec4acfc27d042343c337 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 7 Jun 2013 15:35:16 +0200 Subject: [PATCH] Fix typo (failback vs fallback). --- ChangeLog | 4 ++++ conf/Makefile.common | 2 +- grub-core/Makefile.am | 2 +- grub-core/Makefile.core.def | 2 +- grub-core/font/font.c | 6 +++--- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95324644b..fa6c165d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-07 Vladimir Serbinenko + + Fix typo (failback vs fallback). + 2013-05-31 Andrey Borzenkov * util/grub.d/30_os-prober.in: Add support for probing EFI diff --git a/conf/Makefile.common b/conf/Makefile.common index 7543dadc5..2e4d5ec88 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -27,7 +27,7 @@ if COND_i386_ieee1275 endif if COND_mips_loongson CFLAGS_PLATFORM += -mexplicit-relocs - CPPFLAGS_PLATFORM = -DUSE_ASCII_FAILBACK + CPPFLAGS_PLATFORM = -DUSE_ASCII_FALLBACK endif if COND_mips CFLAGS_PLATFORM += -mflush-func=grub_red_herring diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index f71e05c5d..c0441d2b3 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -10,7 +10,7 @@ CCAS=$(TARGET_CC) if COND_GRUB_MKFONT 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 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index ba77a21c9..6c98a01de 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -77,7 +77,7 @@ kernel = { mips_qemu_mips_ldflags = '-Wl,-Ttext,0x80200000'; 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)'; emu_cflags = '$(CFLAGS_GNULIB)'; emu_cppflags = '$(CPPFLAGS_GNULIB)'; diff --git a/grub-core/font/font.c b/grub-core/font/font.c index 481c958ef..d603dbe04 100644 --- a/grub-core/font/font.c +++ b/grub-core/font/font.c @@ -33,7 +33,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); -#ifdef USE_ASCII_FAILBACK +#ifdef USE_ASCII_FALLBACK #include "ascii.h" #endif @@ -110,14 +110,14 @@ static struct grub_font null_font; /* Flag to ensure module is initialized only once. */ static grub_uint8_t font_loader_initialized; -#ifdef USE_ASCII_FAILBACK +#ifdef USE_ASCII_FALLBACK static struct grub_font_glyph *ascii_font_glyph[0x80]; #endif static struct grub_font_glyph * ascii_glyph_lookup (grub_uint32_t code) { -#ifdef USE_ASCII_FAILBACK +#ifdef USE_ASCII_FALLBACK static int ascii_failback_initialized = 0; if (code >= 0x80)