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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fc761cb9352d185d1fe009c08a083aa63c5e814a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fc761cb9352d185d1fe009c08a...

Author: Jacek Caban 
Date:   Thu Jul 30 14:14:57 2015 +0200

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

---

tools/widl/parser.l    | 2 +-
 tools/widl/widl.c      | 8 ++++----
 tools/widl/widl.h      | 2 +-
 tools/widl/widl.man.in | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index b911186..b4f2af5 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -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;
    }
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index eace69f..788c45e 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -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;
diff --git a/tools/widl/widl.h b/tools/widl/widl.h
index 9e09f76..d046f28 100644
--- a/tools/widl/widl.h
+++ b/tools/widl/widl.h
@@ -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;
diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in
index 3ee5403..179ffba 100644
--- a/tools/widl/widl.man.in
+++ b/tools/widl/widl.man.in
@@ -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"