* util/grub-mkfont.c [!GRUB_BUILD]: Define my_argp_state.

	[!GRUB_BUILD]: Remove has_argument.

diff --git a/ChangeLog b/ChangeLog
index 999c2ce3175534ea69116376675fc208c0929938..8f197399aa8bcf15933906ebe7c5e375c2d62c9e 100644 (file)
--- 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 45a15553a5e5cc30472e319bfb9fb9ae26efea4c..76ccb26ed2ad02d8dcc7b177855944ed2df099c2 100644 (file)
--- 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)
 {