0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  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. [Thomas: backport from upstream commit
  7. f30c692c1f9ef0e93bee2b408a24baa017f1ca9d, and remove ChangeLog
  8. modifications to avoid conflicts.]
  9. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  10. ---
  11. grub-core/gettext/gettext.c | 4 ++--
  12. 2 files changed, 7 insertions(+), 2 deletions(-)
  13. diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
  14. index df73570..4880cef 100644
  15. --- a/grub-core/gettext/gettext.c
  16. +++ b/grub-core/gettext/gettext.c
  17. @@ -34,8 +34,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
  18. http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html .
  19. */
  20. -static struct grub_gettext_context main_context, secondary_context;
  21. -
  22. static const char *(*grub_gettext_original) (const char *s);
  23. struct grub_gettext_msg
  24. @@ -69,6 +67,8 @@ struct grub_gettext_context
  25. struct grub_gettext_msg *grub_gettext_msg_list;
  26. };
  27. +static struct grub_gettext_context main_context, secondary_context;
  28. +
  29. #define MO_MAGIC_NUMBER 0x950412de
  30. static grub_err_t
  31. --
  32. 2.7.4