From b99fa1546c605bcdbf7ec3da8cedd00b5433c544 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Tue, 11 Oct 2005 19:55:11 +0000
Subject: [PATCH] Rename struct option in order to avoid a conflict with
 wine/port.h.

---
 tools/winedump/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/winedump/main.c b/tools/winedump/main.c
index c5a0e6c7087..6af2282197d 100644
--- a/tools/winedump/main.c
+++ b/tools/winedump/main.c
@@ -198,7 +198,7 @@ static void do_dumpall(void)
     globals.dumpsect = "ALL";
 }
 
-struct option
+struct my_option
 {
   const char *name;
   Mode mode;
@@ -207,7 +207,7 @@ struct option
   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"},
   {"-h",    NONE, 0, do_usage,    "-h           Synonym for --help"},
   {"-?",    NONE, 0, do_usage,    "-?           Synonym for --help"},
@@ -237,7 +237,7 @@ static const struct option option_table[] = {
 
 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 ("Mode options (can be put as the mode (sym/spec/dump...) is declared):\n");
     printf ("\tWhen used in --help mode\n");
@@ -277,7 +277,7 @@ void do_usage (void)
  */
 static void parse_options (char *argv[])
 {
-  const struct option *opt;
+  const struct my_option *opt;
   char *const *ptr;
   const char *arg = NULL;