From: Jacek Caban jacek@codeweavers.com
Fixes a regression from 0bffa3222611015a3b3596c679be53c557daae1b. --- tools/widl/register.c | 2 +- tools/widl/widl.c | 5 ++--- tools/widl/widl.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/widl/register.c b/tools/widl/register.c index c4f81756352..66a07aeb5c4 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -317,7 +317,7 @@ void write_typelib_regscript( const statement_list_t *stmts ) error( "Cannot store multiple typelibs into %s\n", typelib_name ); else { - if (do_old_typelib) + if (old_typelib) create_sltg_typelib( stmt->u.lib ); else create_msft_typelib( stmt->u.lib ); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 489e7c2f9a2..b70fc4cea2a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -99,7 +99,7 @@ int do_everything = 1; static int preprocess_only = 0; int do_header = 0; int do_typelib = 0; -int do_old_typelib = 0; +int old_typelib = 0; int do_proxies = 0; int do_client = 0; int do_server = 0; @@ -256,7 +256,6 @@ static void set_everything(int x) { do_header = x; do_typelib = x; - do_old_typelib = x; do_proxies = x; do_client = x; do_server = x; @@ -618,7 +617,7 @@ static void option_callback( int optc, char *optarg ) do_typelib = 1; break; case OLD_TYPELIB_OPTION: - do_old_typelib = 1; + old_typelib = 1; break; case 'T': typelib_name = xstrdup(optarg); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 33ecfa1f255..358784ae067 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -39,7 +39,7 @@ extern int pedantic; extern int do_everything; extern int do_header; extern int do_typelib; -extern int do_old_typelib; +extern int old_typelib; extern int do_proxies; extern int do_client; extern int do_server;