diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2011-10-20 11:09:21 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-10-24 16:06:17 -0700 |
| commit | 96629d5c21f6b9b1310c1fe7a4a7505c79ed8e2b (patch) | |
| tree | 9c00f98c4fefdc0cdb41db80b281fa456e2cef0b /src/rt/rust_builtin.cpp | |
| parent | 35e01e0137e5edced626b201f2f2ca569247e95a (diff) | |
| download | rust-96629d5c21f6b9b1310c1fe7a4a7505c79ed8e2b.tar.gz rust-96629d5c21f6b9b1310c1fe7a4a7505c79ed8e2b.zip | |
move rand functions into c-stack-cdecl mode
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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); } |