From d9b114df035fa91444c623418bd3c1ecfb2bc5c6 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Thu, 11 Jan 2001 22:31:04 +0000 Subject: [PATCH] Renamed struct option to avoid conflicts with getopt.h. --- tools/winebuild/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index ead9345397f..e00ea2ea16f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -76,7 +76,7 @@ static void cleanup(void) * command-line option handling */ -struct option +struct option_descr { const char *name; int has_arg; @@ -93,7 +93,7 @@ static void do_relay(void); static void do_sym( const char *arg ); static void do_lib( const char *arg ); -static const struct option option_table[] = +static const struct option_descr option_table[] = { { "-fPIC", 0, do_pic, "-fPIC Generate PIC code" }, { "-h", 0, do_usage, "-h Display this help message" }, @@ -129,7 +129,7 @@ static void do_output( const char *arg ) static void do_usage(void) { - const struct option *opt; + const struct option_descr *opt; fprintf( stderr, "Usage: winebuild [options]\n\n" ); fprintf( stderr, "Options:\n" ); for (opt = option_table; opt->name; opt++) fprintf( stderr, " %s\n", opt->usage ); @@ -172,7 +172,7 @@ static void do_lib( const char *arg ) /* parse options from the argv array and remove all the recognized ones */ static void parse_options( char *argv[] ) { - const struct option *opt; + const struct option_descr *opt; char * const * ptr; const char* arg=NULL; -- 2.11.4.GIT