Skip to content

Commit c649060

Browse files
committed
---
yaml --- r: 6229 b: refs/heads/master c: 0d9e32d h: refs/heads/master i: 6227: fc4c6a7 v: v3
1 parent f1c8013 commit c649060

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: b7ab28b50fa346cf14e6fe45ea2c60434dcd979d
2+
refs/heads/master: 0d9e32d70d89bf8f3263518f780d820644dd8513

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

-2
Original file line numberDiff line numberDiff line change
@@ -2010,8 +2010,6 @@ fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
20102010
abi = ast::native_abi_rust_intrinsic;
20112011
} else if str::eq(t, "cdecl") {
20122012
abi = ast::native_abi_cdecl;
2013-
} else if str::eq(t, "c-stack-stdcall") {
2014-
abi = ast::native_abi_stdcall;
20152013
} else if str::eq(t, "stdcall") {
20162014
abi = ast::native_abi_stdcall;
20172015
} else {

trunk/src/lib/win32_os.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type DWORD = u32;
4343
type HMODULE = uint;
4444
type LPTSTR = str::sbuf;
4545

46-
native "c-stack-stdcall" mod kernel32 {
46+
native "stdcall" mod kernel32 {
4747
fn GetEnvironmentVariableA(n: str::sbuf, v: str::sbuf, nsize: uint) ->
4848
uint;
4949
fn SetEnvironmentVariableA(n: str::sbuf, v: str::sbuf) -> int;

0 commit comments

Comments
 (0)