ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Renamed --rt option to --winrt for midl compatibility.

This commit is contained in:
Jacek Caban 2015-07-30 14:14:57 +02:00 committed by Alexandre Julliard
parent 59e41ab912
commit fc761cb935
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/widl/parser.l
View File

@ -419,7 +419,7 @@ static int kw_token(const char *kw)
struct keyword key, *kwp;
key.kw = kw;
kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func);
if (kwp && (do_rt_extension || kwp->token != tNAMESPACE)) {
if (kwp && (winrt_mode || kwp->token != tNAMESPACE)) {
parser_lval.str = xstrdup(kwp->kw);
return kwp->token;
}

8
tools/widl/widl.c
View File

@ -72,7 +72,7 @@ static const char usage[] =
" --prefix-client=p Prefix names of client stubs with 'p'\n"
" --prefix-server=p Prefix names of server functions with 'p'\n"
" -r Generate registration script\n"
" --rt Enable WinRT's language extensions for IDL\n"
" --winrt Enable Windows Runtime mode\n"
" -s Generate server stub\n"
" -t Generate typelib\n"
" -u Generate interface identifiers file\n"
@ -114,7 +114,7 @@ int do_win32 = 1;
int do_win64 = 1;
int win32_packing = 8;
int win64_packing = 8;
int do_rt_extension = 0;
int winrt_mode = 0;
static enum stub_mode stub_mode = MODE_Os;
char *input_name;
@ -175,7 +175,7 @@ static const struct option long_options[] = {
{ "prefix-all", 1, NULL, PREFIX_ALL_OPTION },
{ "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION },
{ "prefix-server", 1, NULL, PREFIX_SERVER_OPTION },
{ "rt", 0, NULL, RT_OPTION },
{ "winrt", 0, NULL, RT_OPTION },
{ "win32", 0, NULL, WIN32_OPTION },
{ "win64", 0, NULL, WIN64_OPTION },
{ "win32-align", 1, NULL, WIN32_ALIGN_OPTION },
@ -578,7 +578,7 @@ int main(int argc,char *argv[])
fprintf(stderr, "%s", usage);
return 0;
case RT_OPTION:
do_rt_extension = 1;
winrt_mode = 1;
break;
case WIN32_OPTION:
do_win32 = 1;

2
tools/widl/widl.h
View File

@ -49,7 +49,7 @@ extern int do_win32;
extern int do_win64;
extern int win32_packing;
extern int win64_packing;
extern int do_rt_extension;
extern int winrt_mode;
extern char *input_name;
extern char *input_idl_name;

4
tools/widl/widl.man.in
View File

@ -83,8 +83,8 @@ Only generate 32-bit or 64-bit code respectively (the default is to
generate both 32-bit and 64-bit versions into the same destination
file).
.PP
.IP "\fB--rt\fR"
Enable additional language extensions for IDL to support WinRT.
.IP "\fB--winrt\fR"
Enable Windows Runtime mode.
.PP
.B Registration script options:
.IP "\fB-r\fR"