---

yaml
---
r: 6225
b: refs/heads/master
c: e963428
h: refs/heads/master
i:
  6223: 86c510f
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1afc943c9174162888631c2ec02af33370a77115
+refs/heads/master: e96342820d0075099d5e3bdf5689c64ad6625a45

trunk/src/comp/syntax/parse/parser.rs

@@ -2012,6 +2012,8 @@ fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
             abi = ast::native_abi_cdecl;
         } else if str::eq(t, "c-stack-stdcall") {
             abi = ast::native_abi_stdcall;
+        } else if str::eq(t, "stdcall") {
+            abi = ast::native_abi_stdcall;
         } else {
             p.fatal("unsupported abi: " + t);
         }

trunk/src/comp/syntax/print/pprust.rs

@@ -408,7 +408,7 @@ fn print_item(s: ps, &&item: @ast::item) {
             word_nbsp(s, "\"c-stack-cdecl\"");
           }
           ast::native_abi_stdcall. {
-            word_nbsp(s, "\"c-stack-stdcall\"");
+            word_nbsp(s, "\"stdcall\"");
           }
         }
         word_nbsp(s, "mod");

trunk/src/test/run-pass/x86stdcall.rs

@@ -2,7 +2,7 @@
 // xfail-test
 
 #[cfg(target_os = "win32")]
-native "c-stack-stdcall" mod kernel32 {
+native "stdcall" mod kernel32 {
     fn SetLastError(err: uint);
     fn GetLastError() -> uint;
 }

trunk/src/test/run-pass/x86stdcall2.rs

@@ -5,7 +5,7 @@ type LPVOID = uint;
 type BOOL = u8;
 
 #[cfg(target_os = "win32")]
-native "c-stack-stdcall" mod kernel32 {
+native "stdcall" mod kernel32 {
        fn GetProcessHeap() -> HANDLE;
        fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) -> LPVOID;
        fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID) -> BOOL;