---

yaml
---
r: 5936
b: refs/heads/master
c: 96629d5
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35e01e0137e5edced626b201f2f2ca569247e95a
+refs/heads/master: 96629d5c21f6b9b1310c1fe7a4a7505c79ed8e2b

trunk/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;

trunk/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);
 }