nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

Blame SOURCES/0463-grub-core-term-efi-console.c-Fix-compile-error.patch

f96e0b
From f7c5895ae7757d790c3c0efea514523775b50c66 Mon Sep 17 00:00:00 2001
f96e0b
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
f96e0b
Date: Tue, 7 May 2013 20:40:00 +0200
f96e0b
Subject: [PATCH 463/482] 	* grub-core/term/efi/console.c: Fix compile
f96e0b
 error.
f96e0b
f96e0b
---
f96e0b
 ChangeLog                    | 4 ++++
f96e0b
 grub-core/term/efi/console.c | 2 +-
f96e0b
 2 files changed, 5 insertions(+), 1 deletion(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index 0430249..5b0b357 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,5 +1,9 @@
f96e0b
 2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
+	* grub-core/term/efi/console.c: Fix compile error.
f96e0b
+
f96e0b
+2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
+
f96e0b
 	Compressed HFS+ support.
f96e0b
 
f96e0b
 2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
f96e0b
index 2d6c6f9..9f76d23 100644
f96e0b
--- a/grub-core/term/efi/console.c
f96e0b
+++ b/grub-core/term/efi/console.c
f96e0b
@@ -86,7 +86,7 @@ grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
f96e0b
   j = 1;
f96e0b
   for (i = 0; i < c->ncomb; i++)
f96e0b
     if (c->base < 0xffff)
f96e0b
-      str[j++] = c->combining[i].code;
f96e0b
+      str[j++] = grub_unicode_get_comb (c)[i].code;
f96e0b
   str[j] = 0;
f96e0b
 
f96e0b
   /* Should this test be cached?  */
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b