From 96629d5c21f6b9b1310c1fe7a4a7505c79ed8e2b Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Thu, 20 Oct 2011 11:09:21 -0700
Subject: [PATCH] move rand functions into c-stack-cdecl mode
---
src/lib/rand.rs | 2 +-
src/rt/rust_builtin.cpp | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/lib/rand.rs b/src/lib/rand.rs
index b4e5ebc3058..11fda074c1c 100644
--- a/src/lib/rand.rs
+++ b/src/lib/rand.rs
@@ -4,7 +4,7 @@
/**
* Bindings the runtime's random number generator (ISAAC).
*/
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
type rctx;
fn rand_new() -> rctx;
fn rand_next(c: rctx) -> u32;
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index ae129a9380d..4cd2979ec8e 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -160,12 +160,22 @@ rand_new() {
}
extern "C" CDECL size_t
+<<<<<<< HEAD
rand_next(randctx *rctx) {
+=======
+rand_next(randctx *rctx)
+{
+>>>>>>> move rand functions into c-stack-cdecl mode
return isaac_rand(rctx);
}
extern "C" CDECL void
+<<<<<<< HEAD
rand_free(randctx *rctx) {
+=======
+rand_free(randctx *rctx)
+{
+>>>>>>> move rand functions into c-stack-cdecl mode
rust_task *task = rust_scheduler::get_task();
task->free(rctx);
}