Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/grub/patches/grub-2.00-gcc6-grub-core-gettext-gettext.c-main_context-secondary_c.patch

    Contents of /trunk/grub/patches/grub-2.00-gcc6-grub-core-gettext-gettext.c-main_context-secondary_c.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2808 - (show annotations) (download)
    Mon Jun 13 11:59:47 2016 UTC (7 years, 10 months ago) by niro
    File size: 1187 byte(s) 
    -fixed ftbfs with gcc6
    1 From f30c692c1f9ef0e93bee2b408a24baa017f1ca9d Mon Sep 17 00:00:00 2001
    2 From: Vladimir Serbinenko <phcoder@gmail.com>
    3 Date: Thu, 7 Nov 2013 01:01:47 +0100
    4 Subject: [PATCH] * grub-core/gettext/gettext.c (main_context),
    5 (secondary_context): Define after defining type and not before.
    6
    7 ---
    8 Signed-off-by: Khem Raj <raj.khem@gmail.com>
    9 Upstream-Status: Backport
    10
    11 ChangeLog | 5 +++++
    12 grub-core/gettext/gettext.c | 4 ++--
    13 2 files changed, 7 insertions(+), 2 deletions(-)
    14
    15 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
    16 index df73570..4880cef 100644
    17 --- a/grub-core/gettext/gettext.c
    18 +++ b/grub-core/gettext/gettext.c
    19 @@ -34,8 +34,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
    20 http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html .
    21 */
    22
    23 -static struct grub_gettext_context main_context, secondary_context;
    24 -
    25 static const char *(*grub_gettext_original) (const char *s);
    26
    27 struct grub_gettext_msg
    28 @@ -69,6 +67,8 @@ struct grub_gettext_context
    29 struct grub_gettext_msg *grub_gettext_msg_list;
    30 };
    31
    32 +static struct grub_gettext_context main_context, secondary_context;
    33 +
    34 #define MO_MAGIC_NUMBER 0x950412de
    35
    36 static grub_err_t
    37 --
    38 1.9.1
    39