PATCH: struct option redefined

[Marcus Meissner]

Hi,

Ciao, Marcus

Changelog:
	renamed struct option to struct debug_option to avoid compile
	problems where struct option is already defined.

Index: library/debug.c
===================================================================
RCS file: /home/wine/wine/library/debug.c,v
retrieving revision 1.2
diff -u -r1.2 debug.c
--- library/debug.c	2000/11/08 04:33:20	1.2
+++ library/debug.c	2001/11/06 17:43:06
@@ -19,16 +19,16 @@
 
 static struct dll *first_dll;
 
-struct option
+struct debug_option
 {
-    struct option *next;       /* next option in list */
+    struct debug_option *next;       /* next option in list */
     unsigned char  set;        /* bits to set */
     unsigned char  clear;      /* bits to clear */
     char           name[14];   /* channel name, or empty for "all" */
 };
 
-static struct option *first_option;
-static struct option *last_option;
+static struct debug_option *first_option;
+static struct debug_option *last_option;
 
 
 static int cmp_name( const void *p1, const void *p2 )
@@ -39,7 +39,7 @@
 }
 
 /* apply a debug option to the channels of a given dll */
-static void apply_option( struct dll *dll, const struct option *opt )
+static void apply_option( struct dll *dll, const struct debug_option *opt )
 {
     if (opt->name[0])
     {
@@ -58,7 +58,7 @@
 /* register a new set of channels for a dll */
 void *__wine_dbg_register( char * const *channels, int nb )
 {
-    struct option *opt = first_option;
+    struct debug_option *opt = first_option;
     struct dll *dll = malloc( sizeof(*dll) );
     if (dll)
     {
@@ -97,7 +97,7 @@
 void wine_dbg_add_option( const char *name, unsigned char set, unsigned char clear )
 {
     struct dll *dll = first_dll;
-    struct option *opt;
+    struct debug_option *opt;
 
     if (!(opt = malloc( sizeof(*opt) ))) return;
     opt->next  = NULL;