about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-11-09 18:45:25 -0800
committerBrian Anderson <banderson@mozilla.com>2011-11-09 18:45:25 -0800
commit0d9e32d70d89bf8f3263518f780d820644dd8513 (patch)
treebda707ab17d6f52c278d5bdf51de6799be21e9e8
parentb7ab28b50fa346cf14e6fe45ea2c60434dcd979d (diff)
downloadrust-0d9e32d70d89bf8f3263518f780d820644dd8513.tar.gz
rust-0d9e32d70d89bf8f3263518f780d820644dd8513.zip
Rename "c-stack-stdcall" ABI to "stdcall"
-rw-r--r--src/comp/syntax/parse/parser.rs2
-rw-r--r--src/lib/win32_os.rs2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 87b2cc175c0..214955b14a0 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -2010,8 +2010,6 @@ fn parse_item_native_mod(p: parser, attrs: [ast::attribute]) -> @ast::item {
             abi = ast::native_abi_rust_intrinsic;
         } else if str::eq(t, "cdecl") {
             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 {
diff --git a/src/lib/win32_os.rs b/src/lib/win32_os.rs
index 8c9691208cf..6ffa2bc25a4 100644
--- a/src/lib/win32_os.rs
+++ b/src/lib/win32_os.rs
@@ -43,7 +43,7 @@ type DWORD = u32;
 type HMODULE = uint;
 type LPTSTR = str::sbuf;
 
-native "c-stack-stdcall" mod kernel32 {
+native "stdcall" mod kernel32 {
     fn GetEnvironmentVariableA(n: str::sbuf, v: str::sbuf, nsize: uint) ->
        uint;
     fn SetEnvironmentVariableA(n: str::sbuf, v: str::sbuf) -> int;