vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
[!GRUB_BUILD]: Remove has_argument.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-22 18:15:22 +02:00
parent 8c8c87b7d4
commit 506b336b82
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2013-08-22 Vladimir Serbinenko <phcoder@gmail.com>
* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath) [_WIN32]: * util/ieee1275/ofpath.c (grub_util_devname_to_ofpath) [_WIN32]:

5
util/grub-mkfont.c
View file

@ -960,6 +960,7 @@ static struct argp_option options[] = {
#define MY_ARGP_KEY_ARG ARGP_KEY_ARG #define MY_ARGP_KEY_ARG ARGP_KEY_ARG
#define my_error_t error_t #define my_error_t error_t
#define MY_ARGP_ERR_UNKNOWN ARGP_ERR_UNKNOWN #define MY_ARGP_ERR_UNKNOWN ARGP_ERR_UNKNOWN
#define my_argp_state argp_state
#else #else
@ -986,6 +987,8 @@ struct arguments
enum file_formats file_format; enum file_formats file_format;
}; };
#ifdef GRUB_BUILD
static int static int
has_argument (int v) has_argument (int v)
{ {
@ -993,6 +996,8 @@ has_argument (int v)
|| v == 'd' || v == 'c'; || v == 'd' || v == 'c';
} }
#endif
static my_error_t static my_error_t
argp_parser (int key, char *arg, struct my_argp_state *state) argp_parser (int key, char *arg, struct my_argp_state *state)
{ {