From 506b336b82e156a4007fe234e2e796fc37719ec0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 22 Aug 2013 18:15:22 +0200
Subject: [PATCH] 	* util/grub-mkfont.c [!GRUB_BUILD]: Define
 my_argp_state. 	[!GRUB_BUILD]: Remove has_argument.

---
 ChangeLog          | 5 +++++
 util/grub-mkfont.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 999c2ce31..8f197399a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkfont.c [!GRUB_BUILD]: Define my_argp_state.
+	[!GRUB_BUILD]: Remove has_argument.
+
 2013-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath) [_WIN32]:
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 45a15553a..76ccb26ed 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -960,6 +960,7 @@ static struct argp_option options[] = {
 #define MY_ARGP_KEY_ARG ARGP_KEY_ARG
 #define my_error_t error_t
 #define MY_ARGP_ERR_UNKNOWN ARGP_ERR_UNKNOWN
+#define my_argp_state argp_state
 
 #else
 
@@ -986,6 +987,8 @@ struct arguments
   enum file_formats file_format;
 };
 
+#ifdef GRUB_BUILD
+
 static int
 has_argument (int v)
 {
@@ -993,6 +996,8 @@ has_argument (int v)
     || v == 'd' || v == 'c';
 }
 
+#endif
+
 static my_error_t
 argp_parser (int key, char *arg, struct my_argp_state *state)
 {