Skip to content

Commit 645d163

Browse files
committed
---
yaml --- r: 3587 b: refs/heads/master c: 291df4d h: refs/heads/master i: 3585: 4bcd966 3583: 4d4c650 v: v3
1 parent 02dc3e6 commit 645d163

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a7d82a7f0fca121a336a84f88499cc2ec4f97447
2+
refs/heads/master: 291df4d73287b80764a5d42e71ab7fec31e3f3c3

trunk/src/rt/rust_builtin.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ nano_time(rust_task *task, uint64_t *ns) {
621621
/**
622622
* Preallocates the exact number of bytes in the given interior vector.
623623
*/
624-
extern "C" void
624+
extern "C" CDECL void
625625
ivec_reserve(rust_task *task, type_desc *ty, rust_ivec *v, size_t n_elems)
626626
{
627627
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)
652652
* Returns true if the given vector is on the heap and false if it's on the
653653
* stack.
654654
*/
655-
extern "C" bool
655+
extern "C" CDECL bool
656656
ivec_on_heap(rust_task *task, type_desc *ty, rust_ivec *v)
657657
{
658658
return !v->fill && v->payload.ptr;
@@ -661,7 +661,7 @@ ivec_on_heap(rust_task *task, type_desc *ty, rust_ivec *v)
661661
/**
662662
* Returns an unsafe pointer to the data part of an interior vector.
663663
*/
664-
extern "C" void *
664+
extern "C" CDECL void *
665665
ivec_to_ptr(rust_task *task, type_desc *ty, rust_ivec *v)
666666
{
667667
return v->fill ? v->payload.data : v->payload.ptr->data;
@@ -681,7 +681,7 @@ get_ivec_size(rust_ivec *v)
681681
* Copies elements in an unsafe buffer to the given interior vector. The
682682
* vector must have size zero.
683683
*/
684-
extern "C" void
684+
extern "C" CDECL void
685685
ivec_copy_from_buf(rust_task *task, type_desc *ty, rust_ivec *v, void *ptr,
686686
size_t count)
687687
{
@@ -706,12 +706,12 @@ ivec_copy_from_buf(rust_task *task, type_desc *ty, rust_ivec *v, void *ptr,
706706
v->payload.ptr->fill = new_size;
707707
}
708708

709-
extern "C" void
709+
extern "C" CDECL void
710710
pin_task(rust_task *task) {
711711
task->pin();
712712
}
713713

714-
extern "C" void
714+
extern "C" CDECL void
715715
unpin_task(rust_task *task) {
716716
task->unpin();
717717
}

0 commit comments

Comments
 (0)