Rename struct option in order to avoid a conflict with wine/port.h.

This commit is contained in:
Dmitry Timoshkov 2005-10-11 19:55:11 +00:00 committed by Alexandre Julliard
parent 22ab2046fb
commit b99fa1546c
1 changed files with 4 additions and 4 deletions

View File

@ -198,7 +198,7 @@ static void do_dumpall(void)
globals.dumpsect = "ALL"; globals.dumpsect = "ALL";
} }
struct option struct my_option
{ {
const char *name; const char *name;
Mode mode; Mode mode;
@ -207,7 +207,7 @@ struct option
const char *usage; const char *usage;
}; };
static const struct option option_table[] = { static const struct my_option option_table[] = {
{"--help",NONE, 0, do_usage, "--help Display this help message"}, {"--help",NONE, 0, do_usage, "--help Display this help message"},
{"-h", NONE, 0, do_usage, "-h Synonym for --help"}, {"-h", NONE, 0, do_usage, "-h Synonym for --help"},
{"-?", NONE, 0, do_usage, "-? Synonym for --help"}, {"-?", NONE, 0, do_usage, "-? Synonym for --help"},
@ -237,7 +237,7 @@ static const struct option option_table[] = {
void do_usage (void) void do_usage (void)
{ {
const struct option *opt; const struct my_option *opt;
printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <dll> | emf <emf> | lnk <lnk>]\n"); printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <dll> | emf <emf> | lnk <lnk>]\n");
printf ("Mode options (can be put as the mode (sym/spec/dump...) is declared):\n"); printf ("Mode options (can be put as the mode (sym/spec/dump...) is declared):\n");
printf ("\tWhen used in --help mode\n"); printf ("\tWhen used in --help mode\n");
@ -277,7 +277,7 @@ void do_usage (void)
*/ */
static void parse_options (char *argv[]) static void parse_options (char *argv[])
{ {
const struct option *opt; const struct my_option *opt;
char *const *ptr; char *const *ptr;
const char *arg = NULL; const char *arg = NULL;