OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rt: Add missing CDECL to routines in rust_builtin

Browse Source
This commit is contained in:
Patrick Walton 2011-07-05 14:28:50 -07:00
parent a7d82a7f0f
commit 291df4d732
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rt/rust_builtin.cpp
View File

@ -621,7 +621,7 @@ nano_time(rust_task *task, uint64_t *ns) {
/** /**
* Preallocates the exact number of bytes in the given interior vector. * Preallocates the exact number of bytes in the given interior vector.
*/ */
extern "C" void extern "C" CDECL void
ivec_reserve(rust_task *task, type_desc *ty, rust_ivec *v, size_t n_elems) ivec_reserve(rust_task *task, type_desc *ty, rust_ivec *v, size_t n_elems)
{ {
size_t new_alloc = n_elems * ty->size; size_t new_alloc = n_elems * ty->size;
@ -652,7 +652,7 @@ ivec_reserve(rust_task *task, type_desc *ty, rust_ivec *v, size_t n_elems)
* Returns true if the given vector is on the heap and false if it's on the * Returns true if the given vector is on the heap and false if it's on the
* stack. * stack.
*/ */
extern "C" bool extern "C" CDECL bool
ivec_on_heap(rust_task *task, type_desc *ty, rust_ivec *v) ivec_on_heap(rust_task *task, type_desc *ty, rust_ivec *v)
{ {
return !v->fill && v->payload.ptr; return !v->fill && v->payload.ptr;
@ -661,7 +661,7 @@ ivec_on_heap(rust_task *task, type_desc *ty, rust_ivec *v)
/** /**
* Returns an unsafe pointer to the data part of an interior vector. * Returns an unsafe pointer to the data part of an interior vector.
*/ */
extern "C" void * extern "C" CDECL void *
ivec_to_ptr(rust_task *task, type_desc *ty, rust_ivec *v) ivec_to_ptr(rust_task *task, type_desc *ty, rust_ivec *v)
{ {
return v->fill ? v->payload.data : v->payload.ptr->data; return v->fill ? v->payload.data : v->payload.ptr->data;
@ -681,7 +681,7 @@ get_ivec_size(rust_ivec *v)
* Copies elements in an unsafe buffer to the given interior vector. The * Copies elements in an unsafe buffer to the given interior vector. The
* vector must have size zero. * vector must have size zero.
*/ */
extern "C" void extern "C" CDECL void
ivec_copy_from_buf(rust_task *task, type_desc *ty, rust_ivec *v, void *ptr, ivec_copy_from_buf(rust_task *task, type_desc *ty, rust_ivec *v, void *ptr,
size_t count) size_t count)
{ {
@ -706,12 +706,12 @@ ivec_copy_from_buf(rust_task *task, type_desc *ty, rust_ivec *v, void *ptr,
v->payload.ptr->fill = new_size; v->payload.ptr->fill = new_size;
} }
extern "C" void extern "C" CDECL void
pin_task(rust_task *task) { pin_task(rust_task *task) {
task->pin(); task->pin();
} }
extern "C" void extern "C" CDECL void
unpin_task(rust_task *task) { unpin_task(rust_task *task) {
task->unpin(); task->unpin();
} }