From f9e3a604a6d928f01dab16432e4181caeea0cac6 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 29 Sep 2011 18:52:23 -0700
Subject: [PATCH] rustc: Make the generic C stack function signature include a
 usable return value

---
 src/comp/back/upcall.rs  | 2 +-
 src/comp/middle/trans.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/comp/back/upcall.rs b/src/comp/back/upcall.rs
index 1e80df72631e..71509e128008 100644
--- a/src/comp/back/upcall.rs
+++ b/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())
          };
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index 35ecd1470820..622db05be736 100644
--- a/src/comp/middle/trans.rs
+++ b/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;