---

yaml
---
r: 5621
b: refs/heads/master
c: f9e3a60
h: refs/heads/master
i:
  5619: 14b1dff
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6dbcb0303c99c29bb8579abff7cee50befeb6c
+refs/heads/master: f9e3a604a6d928f01dab16432e4181caeea0cac6

trunk/src/comp/back/upcall.rs

@@ -83,7 +83,7 @@ fn declare_upcalls(_tn: type_names, tydesc_type: TypeRef,
           dynastack_free: d("dynastack_free", [T_ptr(T_i8())], T_void()),
           alloc_c_stack: dr("alloc_c_stack", [T_size_t()], T_ptr(T_i8())),
           call_c_stack: dr("call_c_stack",
-                           [T_ptr(T_fn([], T_void())), T_ptr(T_i8())],
+                           [T_ptr(T_fn([], T_int())), T_ptr(T_i8())],
                            T_int()),
           rust_personality: dr("rust_personality", [], T_i32())
          };

trunk/src/comp/middle/trans.rs

@@ -5792,7 +5792,7 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str,
         cast_to_i32 = true;
       }
       ast::native_abi_c_stack_cdecl. {
-        let llfn = decl_cdecl_fn(ccx.llmod, name, T_fn([], T_void()));
+        let llfn = decl_cdecl_fn(ccx.llmod, name, T_fn([], T_int()));
         ccx.item_ids.insert(id, llfn);
         ccx.item_symbols.insert(id, name);
         ret;