about summary refs log tree commit diff
path: root/src/rt
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2011-12-13 21:43:55 -0800
committerNiko Matsakis <niko@alum.mit.edu>2011-12-14 14:32:25 -0800
commit35fe86dab74254cf4b74a4e28506fa84d81871e2 (patch)
tree63ecd13e696aeb00a7a887df6c57cf2b07068b04 /src/rt
parent1869306a7e3d94aaf474b6f27671d3844db088a1 (diff)
downloadrust-35fe86dab74254cf4b74a4e28506fa84d81871e2.tar.gz
rust-35fe86dab74254cf4b74a4e28506fa84d81871e2.zip
export upcall_clone_type_desc
Diffstat (limited to 'src/rt')
-rw-r--r--src/rt/memory_region.h2
-rw-r--r--src/rt/rust_upcall.cpp2
-rw-r--r--src/rt/rustrt.def.in1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/rt/memory_region.h b/src/rt/memory_region.h
index 4caecb3cd5d..1a3e94c10bd 100644
--- a/src/rt/memory_region.h
+++ b/src/rt/memory_region.h
@@ -15,7 +15,7 @@
 //
 // 0 --- no headers, no debugging support
 // 1 --- support poison, but do not track allocations
-// 2 --- track allocations in deatil
+// 2 --- track allocations in detail
 //
 // NB: please do not commit code with level 2. It's
 // hugely expensive and should only be used as a last resort.
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 754a1f2d189..ddf490f6dba 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -224,7 +224,7 @@ void upcall_s_clone_type_desc(s_clone_type_desc_args *args)
  * Called to deep-clone type descriptors so they can be attached to a sendable
  * function.  Eventually this should perhaps move to a centralized hashtable.
  */
-type_desc *
+extern "C" CDECL type_desc *
 upcall_clone_type_desc(type_desc *td) {
     s_clone_type_desc_args args = { td, 0 };
     SWITCH_STACK(&args, upcall_s_clone_type_desc);
diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in
index 306c750c8fb..a29941169cb 100644
--- a/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@ -58,6 +58,7 @@ upcall_dynastack_free
 upcall_dynastack_mark
 upcall_fail
 upcall_free
+upcall_clone_type_desc
 upcall_get_type_desc
 upcall_log_type
 upcall_malloc